summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp18
-rw-r--r--core/pim/addressbook/abtable.cpp57
-rw-r--r--core/pim/addressbook/abview.cpp61
-rw-r--r--core/pim/addressbook/addressbook.cpp67
-rw-r--r--core/pim/addressbook/configdlg.cpp11
-rw-r--r--core/pim/addressbook/contacteditor.cpp82
-rw-r--r--core/pim/addressbook/opie-addressbook.control2
-rw-r--r--core/pim/addressbook/picker.cpp28
8 files changed, 170 insertions, 156 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 70a66a0..8216d6f 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -11,25 +11,25 @@
** 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.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "ablabel.h"
-
+#include <opie2/odebug.h>
AbLabel::AbLabel( QWidget *parent, const char *name ):
QTextView( parent, name ),
m_empty( false )
{
}
AbLabel::~AbLabel()
{
}
void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
@@ -86,50 +86,50 @@ void AbLabel::sync()
{
QString text = (*m_itCurContact).toRichText();
setText( text );
}
void AbLabel::keyPressEvent( QKeyEvent *e )
{
// Commonly handled keys
if ( !m_empty ){
switch( e->key() ) {
case Qt::Key_Left:
- qWarning( "Left..");
+ Opie::Core::owarn << "Left.." << oendl;
case Qt::Key_Right:
- qWarning( "Right..");
+ Opie::Core::owarn << "Right.." << oendl;
case Qt::Key_F33:
- qWarning( "OK..");
+ Opie::Core::owarn << "OK.." << oendl;
emit signalOkPressed();
break;
case Qt::Key_Up:
- qWarning( "UP..");
+ Opie::Core::owarn << "Up.." << oendl;
if ( ( visibleHeight() < contentsHeight() ) &&
( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
scrollBy( 0, -(visibleHeight()-20) );
else {
--m_itCurContact;
if ( *m_itCurContact != Opie::OPimContact() )
sync();
else
m_itCurContact = m_viewList.end();
}
break;
case Qt::Key_Down:
- qWarning( "DOWN..");
-// qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight());
-// qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
-// , verticalScrollBar()->maxValue() );
+ Opie::Core::owarn << "Down.." << oendl;
+// Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
+// Opie::Core::owarn << "Value: " << verticalScrollBar()->value()
+// << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
if ( ( visibleHeight() < contentsHeight() ) &&
( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
scrollBy( 0, visibleHeight()-20 );
else {
++m_itCurContact;
if ( *m_itCurContact != Opie::OPimContact() )
sync();
else
m_itCurContact = m_viewList.begin();
}
break;
case Qt::Key_Return: // fall through
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index cd77b13..cb57342 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -10,25 +10,25 @@
** 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.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
-
+#include <opie2/odebug.h>
#include <opie2/opimrecordlist.h>
#include <qpe/timestring.h>
#include <qpe/resource.h>
#include "abtable.h"
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
@@ -112,56 +112,55 @@ void AbPickItem::setContentFromEditor( QWidget *w )
\brief QTable based class for showing a list of entries
*/
AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
: QTable( parent, name ),
lastSortCol( -1 ),
asc( TRUE ),
intFields( order ),
enablePainting( true ),
columnVisible( true ),
countNested( 0 )
{
- // qWarning("C'tor start");
-
+ // Opie::Core::owarn << "C'tor start" << oendl;
setSelectionMode( NoSelection );
init();
setSorting( TRUE );
connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
this, SLOT(itemClicked(int,int)) );
// contactList.clear();
- // qWarning("C'tor end");
+ // Opie::Core::owarn << "C'tor end" << oendl;
}
AbTable::~AbTable()
{
}
void AbTable::init()
{
// :SX showChar = '\0';
setNumRows( 0 );
setNumCols( 2 );
horizontalHeader()->setLabel( 0, tr( "Full Name" ));
horizontalHeader()->setLabel( 1, tr( "Contact" ));
setLeftMargin( 0 );
verticalHeader()->hide();
columnVisible = true;
}
void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
{
- qWarning("AbTable::setContacts()");
+ Opie::Core::owarn << "AbTable::setContacts()" << oendl;
clear();
m_viewList = viewList;
setSorting( false );
setPaintingEnabled( FALSE );
Opie::OPimContactAccess::List::Iterator it;
setNumRows( m_viewList.count() );
// int row = 0;
// for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
// insertIntoTable( *it, row++ );
@@ -175,55 +174,56 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
setPaintingEnabled( TRUE );
}
void AbTable::setOrderedList( const QValueList<int> ordered )
{
intFields = ordered;
}
bool AbTable::selectContact( int UID )
{
- qWarning( "AbTable::selectContact( %d )", UID );
+ Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl;
int rows = numRows();
Opie::OPimContact* foundContact = 0l;
bool found = false;
setPaintingEnabled( FALSE );
- qWarning( "search start" );
+ Opie::Core::owarn << "Search start" << oendl;
for ( int r = 0; r < rows; ++r ) {
if ( m_viewList.uidAt( r ) == UID ){
ensureCellVisible( r, 0 );
setCurrentCell( r, 0 );
found = true;
break;
}
}
- qWarning( "search end" );
+ Opie::Core::owarn << "Search end" << oendl;
if ( !found ){
ensureCellVisible( 0,0 );
setCurrentCell( 0, 0 );
}
setPaintingEnabled( TRUE );
return true;
}
#if 0
void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
{
- qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
+ Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
+ << row << " )" << oendl;
QString strName;
ContactItem contactItem;
strName = findContactName( cnt );
contactItem = findContactContact( cnt, row );
AbTableItem *ati;
ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
contactList.insert( ati, cnt );
setItem( row, 0, ati );
ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
if ( !contactItem.icon.isNull() )
@@ -248,25 +248,25 @@ void AbTable::columnClicked( int col )
if ( col == lastSortCol ) {
asc = !asc;
} else {
lastSortCol = col;
asc = TRUE;
}
//QMessageBox::information( this, "resort", "columnClicked" );
resort();
}
void AbTable::resort()
{
- qWarning( "void AbTable::resort() NOT POSSIBLE !!" );
+ Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
#if 0
setPaintingEnabled( FALSE );
if ( sorting() ) {
if ( lastSortCol == -1 )
lastSortCol = 0;
sortColumn( lastSortCol, asc, TRUE );
//QMessageBox::information( this, "resort", "resort" );
updateVisible();
}
setPaintingEnabled( TRUE );
#endif
}
@@ -274,43 +274,43 @@ void AbTable::resort()
Opie::OPimContact AbTable::currentEntry()
{
return m_viewList[currentRow()];
}
int AbTable::currentEntry_UID()
{
return ( currentEntry().uid() );
}
void AbTable::clear()
{
- qWarning( "void AbTable::clear()" );
+ Opie::Core::owarn << "void AbTable::clear()" << oendl;
// contactList.clear();
setPaintingEnabled( FALSE );
for ( int r = 0; r < numRows(); ++r ) {
for ( int c = 0; c < numCols(); ++c ) {
if ( cellWidget( r, c ) )
clearCellWidget( r, c );
clearCell( r, c );
}
}
setNumRows( 0 );
setPaintingEnabled( TRUE );
}
// Refresh updates column 2 if the contactsettings changed
void AbTable::refresh()
{
- qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" );
+ Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
#if 0
int rows = numRows();
AbTableItem *abi;
ContactItem contactItem;
setPaintingEnabled( FALSE );
for ( int r = 0; r < rows; ++r ) {
abi = static_cast<AbTableItem*>( item(r, 0) );
contactItem = findContactContact( contactList[abi], r );
static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() );
if ( !contactItem.icon.isNull() ){
@@ -325,48 +325,48 @@ void AbTable::refresh()
setPaintingEnabled( TRUE );
#endif
}
void AbTable::keyPressEvent( QKeyEvent *e )
{
char key = toupper( e->ascii() );
if ( key >= 'A' && key <= 'Z' )
moveTo( key );
- // qWarning("Received key ..");
+ // Opie::Core::owarn << "Received key .." << oendl;
switch( e->key() ) {
case Qt::Key_Space:
case Qt::Key_Return:
case Qt::Key_Enter:
emit signalSwitch();
break;
// case Qt::Key_Up:
-// qWarning("a");
+// Opie::Core::owarn << "a" << oendl;
// emit signalKeyUp();
// break;
// case Qt::Key_Down:
-// qWarning("b");
+// Opie::Core::owarn << "b" << oendl;
// emit signalKeyDown();
// break;
default:
QTable::keyPressEvent( e );
}
}
void AbTable::moveTo( char c )
{
- qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
+ Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
#if 0
int rows = numRows();
QString value;
AbTableItem *abi;
int r;
if ( asc ) {
r = 0;
while ( r < rows-1) {
abi = static_cast<AbTableItem*>( item(r, 0) );
QChar first = abi->key()[0];
//### is there a bug in QChar to char comparison???
@@ -414,25 +414,25 @@ void AbTable::resizeRows() {
if (numRows()) {
for (int i = 0; i < numRows(); i++) {
setRowHeight( i, size );
}
}
updateVisible();
*/
}
void AbTable::realignTable()
{
- // qWarning( "void AbTable::realignTable()" );
+ // Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
setPaintingEnabled( FALSE );
resizeRows();
fitColumns();
setPaintingEnabled( TRUE );
}
@@ -464,77 +464,77 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
// return 18*row;
// }
// int AbTable::rowAt( int pos ) const
// {
// return QMIN( pos/18, numRows()-1 );
// }
void AbTable::fitColumns()
{
- qWarning( "void AbTable::fitColumns()" );
+ Opie::Core::owarn << "void AbTable::fitColumns()" << oendl;
int contentsWidth = visibleWidth() / 2;
// Fix to better value
// contentsWidth = 130;
setPaintingEnabled( FALSE );
if ( columnVisible == false ){
showColumn(0);
columnVisible = true;
}
- // qWarning("Width: %d", contentsWidth);
+ // Opie::Core::owarn << "Width: " << contentsWidth << oendl;
setColumnWidth( 0, contentsWidth );
adjustColumn(1);
if ( columnWidth(1) < contentsWidth )
setColumnWidth( 1, contentsWidth );
setPaintingEnabled( TRUE );
}
void AbTable::show()
{
- // qWarning( "void AbTable::show()" );
+ // Opie::Core::owarn << "void AbTable::show()" << oendl;
realignTable();
QTable::show();
}
#if 0
void AbTable::setChoiceNames( const QStringList& list)
{
choicenames = list;
if ( choicenames.isEmpty() ) {
// hide pick column
setNumCols( 2 );
} else {
// show pick column
setNumCols( 3 );
setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
horizontalHeader()->setLabel( 2, tr( "Pick" ));
}
fitColumns();
}
#endif
void AbTable::itemClicked(int,int col)
{
- // qWarning( "AbTable::itemClicked(int, col:%d)", col);
+ // Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
if ( col == 2 ) {
return;
} else {
- // qWarning ("Emitting signalSwitch()");
+ // Opie::Core::owarn << "Emitting signalSwitch()" << oendl;
emit signalSwitch();
}
}
#if 0
QStringList AbTable::choiceNames() const
{
return choicenames;
}
#endif
void AbTable::setChoiceSelection( const QValueList<int>& list )
@@ -553,25 +553,25 @@ QStringList AbTable::choiceSelection(int /*index*/) const
if ( text(row,2) == selname ) {
r.append(c->email);
}
}
*/
return r;
}
void AbTable::updateVisible()
{
- // qWarning("void AbTable::updateVisible()");
+ // Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
int visible,
totalRows,
row,
selectedRow = 0;
visible = 0;
setPaintingEnabled( FALSE );
realignTable();
@@ -589,55 +589,58 @@ void AbTable::updateVisible()
if ( selectedRow )
setCurrentCell( selectedRow, 0 );
if ( !visible )
setCurrentCell( -1, 0 );
setPaintingEnabled( TRUE );
}
void AbTable::setPaintingEnabled( bool e )
{
- // qWarning("IN void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
+ // Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+ // << countNested << oendl;
if ( e ) {
if ( countNested > 0 )
--countNested;
if ( ! countNested ){
setUpdatesEnabled( true );
enablePainting = true;
rowHeightChanged( 0 );
viewport()->update();
}
} else {
++countNested;
enablePainting = false;
setUpdatesEnabled( false );
}
- // qWarning("OUT void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
+ // Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+ // << countNested << oendl;
}
void AbTable::viewportPaintEvent( QPaintEvent* e ) {
- // qWarning(" void AbTable::viewportPaintEvent( QPaintEvent* e ) -> %d", enablePainting);
+ // Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
+ // << enablePainting << oendl;
if ( enablePainting )
QTable::viewportPaintEvent( e );
}
void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) {
const QColorGroup &cg = colorGroup();
p->save();
- //qWarning( "Paint row: %d", row );
+ // Opie::Core::owarn << "Paint row: " << row << oendl;
Opie::OPimContact act_contact = m_viewList[row];
// Paint alternating background bars
if ( (row % 2 ) == 0 ) {
p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
p->setPen( QPen( cg.text() ) );
}
else {
p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
p->setPen( QPen( cg.buttonText() ) );
}
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index aa242b7..52e5f59 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -8,24 +8,25 @@
** 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.
**
**
**********************************************************************/
#include "abview.h"
#include <opie2/ocontactaccessbackend_vcard.h>
+#include <opie2/odebug.h>
#include <qpe/global.h>
#include <qlayout.h>
#include <assert.h>
// Is defined in LibQPE
extern QString categoryFileName();
QString addressbookPersonalVCardName()
@@ -42,25 +43,25 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
m_inSearch( false ),
m_inPersonal( false ),
m_curr_category( -1 ),
m_curr_View( TableView ),
m_prev_View( TableView ),
m_curr_Contact ( 0 ),
m_contactdb ( 0l ),
m_storedDB ( 0l ),
m_viewStack( 0l ),
m_abTable( 0l ),
m_orderedFields( ordered )
{
- qWarning("AbView::c'tor");
+ Opie::Core::owarn << "AbView::c'tor" << oendl;
// Load default database and handle syncing myself.. !
m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
mCat.load( categoryFileName() );
// Create Layout and put WidgetStack into it.
QVBoxLayout *vb = new QVBoxLayout( this );
m_viewStack = new QWidgetStack( this );
vb->addWidget( m_viewStack );
// Creat TableView
QVBox* tableBox = new QVBox( m_viewStack );
@@ -90,174 +91,175 @@ AbView::~AbView()
m_contactdb -> save();
delete m_contactdb;
if ( m_storedDB ){
m_storedDB -> save();
delete m_storedDB;
}
}
void AbView::setView( Views view )
{
- qWarning("AbView::setView( Views view )");
+ Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
m_curr_View = view;
load();
}
void AbView::addEntry( const Opie::OPimContact &newContact )
{
- qWarning("abview:AddContact");
+ Opie::Core::owarn << "AbView::AddContact" << oendl;
m_contactdb->add ( newContact );
load();
}
void AbView::removeEntry( const int UID )
{
- qWarning("abview:RemoveContact");
+ Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
m_contactdb->remove( UID );
load();
}
void AbView::replaceEntry( const Opie::OPimContact &contact )
{
- qWarning("abview:ReplaceContact");
+ Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
m_contactdb->replace( contact );
load();
}
Opie::OPimContact AbView::currentEntry()
{
Opie::OPimContact currentContact;
switch ( (int) m_curr_View ) {
case TableView:
currentContact = m_abTable -> currentEntry();
break;
case CardView:
currentContact = m_ablabel -> currentEntry();
break;
}
m_curr_Contact = currentContact.uid();
return currentContact;
}
bool AbView::save()
{
- // qWarning("abView:Save data");
+ // Opie::Core::owarn << "AbView::Save data" << oendl;
return m_contactdb->save();
}
void AbView::load()
{
- qWarning("abView:Load data");
+ Opie::Core::owarn << "AbView::Load data" << oendl;
// Letter Search is stopped at this place
emit signalClearLetterPicker();
if ( m_inPersonal )
// VCard Backend does not sort..
m_list = m_contactdb->allRecords();
else{
m_list = m_contactdb->sorted( true, 0, 0, 0 );
if ( m_curr_category != -1 )
clearForCategory();
}
- qWarning ("Number of contacts: %d", m_list.count());
+ Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
updateView( true );
}
void AbView::reload()
{
- qWarning( "void AbView::reload()" );
+ Opie::Core::owarn << "AbView::::reload()" << oendl;
m_contactdb->reload();
load();
}
void AbView::clear()
{
// :SX
}
void AbView::setShowByCategory( const QString& cat )
{
- qWarning("AbView::setShowCategory( const QString& cat )");
+ Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
int intCat = 0;
// All (cat == NULL) will be stored as -1
if ( cat.isNull() )
intCat = -1;
else
intCat = mCat.id("Contacts", cat );
// Just do anything if we really change the category
if ( intCat != m_curr_category ){
- // qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category);
+ // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
+ // << m_curr_category << oendl;
m_curr_category = intCat;
emit signalClearLetterPicker();
load();
}
}
void AbView::setShowToView( Views view )
{
- qWarning("void AbView::setShowToView( View %d )", view);
+ Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
if ( m_curr_View != view ){
- qWarning ("Change the View (Category is: %d)", m_curr_category);
+ Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
m_prev_View = m_curr_View;
m_curr_View = view;
updateView();
}
}
void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
{
- qWarning("void AbView::setShowByLetter( %c, %d )", c, mode );
+ Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
assert( mode < AbConfig::LASTELEMENT );
Opie::OPimContact query;
if ( c == 0 ){
load();
return;
}else{
// If the current Backend is unable to solve the query, we will
// ignore the request ..
if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
return;
}
switch( mode ){
case AbConfig::LastName:
query.setLastName( QString("%1*").arg(c) );
break;
case AbConfig::FileAs:
query.setFileAs( QString("%1*").arg(c) );
break;
default:
- qWarning( "Unknown Searchmode for AbView::setShowByLetter ! -> %d", mode );
- qWarning( "I will ignore it.." );
+ Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
+ << "I will ignore it.." << oendl;
return;
}
m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
if ( m_curr_category != -1 )
clearForCategory();
m_curr_Contact = 0;
}
updateView( true );
}
void AbView::setListOrder( const QValueList<int>& ordered )
{
@@ -268,25 +270,25 @@ void AbView::setListOrder( const QValueList<int>& ordered )
}
updateView();
}
QString AbView::showCategory() const
{
return mCat.label( "Contacts", m_curr_category );
}
void AbView::showPersonal( bool personal )
{
- qWarning ("void AbView::showPersonal( %d )", personal);
+ Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
if ( personal ){
if ( m_inPersonal )
return;
// Now switch to vCard Backend and load data.
// The current default backend will be stored
// to avoid unneeded load/stores.
m_storedDB = m_contactdb;
Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
@@ -324,145 +326,146 @@ void AbView::setCurrentUid( int uid ){
QStringList AbView::categories()
{
mCat.load( categoryFileName() );
QStringList categoryList = mCat.labels( "Contacts" );
return categoryList;
}
// BEGIN: Slots
void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
bool , QString cat )
{
- // qWarning( "void AbView::slotDoFind" );
+ // Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
// We reloading the data: Deselect Letterpicker
emit signalClearLetterPicker();
// Use the current Category if nothing else selected
int category = 0;
if ( cat.isEmpty() )
category = m_curr_category;
else{
category = mCat.id("Contacts", cat );
}
- // qWarning ("Find in Category %d", category);
+ // Opie::Core::owarn << "Find in Category " << category << oendl;
QRegExp r( str );
r.setCaseSensitive( caseSensitive );
r.setWildcard( !useRegExp );
// Get all matching entries out of the database
m_list = m_contactdb->matchRegexp( r );
- // qWarning( "found: %d", m_list.count() );
+ // Opie::Core::owarn << "Found: " << m_list.count() << oendl;
if ( m_list.count() == 0 ){
emit signalNotFound();
return;
}
// Now remove all contacts with wrong category (if any selected)
// This algorithm is a litte bit ineffective, but
// we will not have a lot of matching entries..
if ( m_curr_category != -1 )
clearForCategory();
// Now show all found entries
updateView( true );
}
void AbView::offSearch()
{
m_inSearch = false;
load();
}
void AbView::slotSwitch(){
- // qWarning("AbView::slotSwitch()");
+ // Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
m_prev_View = m_curr_View;
switch ( (int) m_curr_View ){
case TableView:
- qWarning("Switching to CardView");
+ Opie::Core::owarn << "Switching to CardView" << oendl;
m_curr_View = CardView;
break;
case CardView:
- qWarning("Switching to TableView");
+ Opie::Core::owarn << "Switching to TableView" << oendl;
m_curr_View = TableView;
break;
}
updateView();
}
// END: Slots
void AbView::clearForCategory()
{
Opie::OPimContactAccess::List::Iterator it;
// Now remove all contacts with wrong category if any category selected
Opie::OPimContactAccess::List allList = m_list;
if ( m_curr_category != -1 ){
for ( it = allList.begin(); it != allList.end(); ++it ){
if ( !contactCompare( *it, m_curr_category ) ){
- // qWarning("Removing %d", (*it).uid());
+ //Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
m_list.remove( (*it).uid() );
}
}
}
}
bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
{
- // qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category);
+ // Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
+ // << category << " )" << oendl;
bool returnMe;
QArray<int> cats;
cats = cnt.categories();
- // qWarning ("Number of categories: %d", cats.count() );
+ // Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
returnMe = false;
if ( cats.count() == 0 && category == 0 )
// Contacts with no category will just shown on "All" and "Unfiled"
returnMe = true;
else {
int i;
for ( i = 0; i < int(cats.count()); i++ ) {
- // qWarning("Comparing %d with %d",cats[i],category );
+ //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
if ( cats[i] == category ) {
returnMe = true;
break;
}
}
}
- // qWarning ("Return: %d", returnMe);
+ // Opie::Core::owarn << "Return: " << returnMe << oendl;
return returnMe;
}
// In Some rare cases we have to update all lists..
void AbView::updateListinViews()
{
m_abTable -> setContacts( m_list );
m_ablabel -> setContacts( m_list );
}
void AbView::updateView( bool newdata )
{
- // qWarning("AbView::updateView()");
+ // Opie::Core::owarn << "AbView::updateView()" << oendl;
if ( m_viewStack -> visibleWidget() ){
m_viewStack -> visibleWidget() -> clearFocus();
}
// If we switching the view, we have to store some information
if ( !newdata ){
if ( m_list.count() ){
switch ( (int) m_prev_View ) {
case TableView:
m_curr_Contact = m_abTable -> currentEntry_UID();
break;
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9ae66d1..94c0a13 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -13,25 +13,25 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
**
**********************************************************************/
#define QTOPIA_INTERNAL_FD
// #include "addresssettings.h"
#include "addressbook.h"
-
+#include <opie2/odebug.h>
#include <opie2/ofileselector.h>
#include <opie2/ofiledialog.h>
#include <opie2/opimcontact.h>
#include <opie2/ocontactaccessbackend_vcard.h>
#include <qpe/resource.h>
#include <qpe/ir.h>
#include <qpe/qpemessagebox.h>
#include <qmenubar.h>
// #include <qtoolbar.h>
// #include <qmenubar.h>
#include <qpe/qpeapplication.h>
@@ -242,57 +242,57 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
vb->addWidget( pLabel );
// All Categories into view-menu..
populateCategories();
// Fontsize
defaultFont = new QFont( m_abView->font() );
slotSetFont(m_config.fontSize());
m_curFontSize = m_config.fontSize();
setCentralWidget(listContainer);
- // qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+ // Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
isLoading = false;
}
void AddressbookWindow::slotConfig()
{
ConfigDlg* dlg = new ConfigDlg( this, "Config" );
dlg -> setConfig( m_config );
if ( QPEApplication::execDialog( dlg ) ) {
- qWarning ("Config Dialog accepted!");
+ Opie::Core::owarn << "Config Dialog accepted!" << oendl;
m_config = dlg -> getConfig();
if ( m_curFontSize != m_config.fontSize() ){
- qWarning("Font was changed!");
+ Opie::Core::owarn << "Font was changed!" << oendl;
m_curFontSize = m_config.fontSize();
emit slotSetFont( m_curFontSize );
}
m_abView -> setListOrder( m_config.orderList() );
}
delete dlg;
}
void AddressbookWindow::slotSetFont( int size )
{
- qWarning("void AddressbookWindow::slotSetFont( %d )", size);
+ Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
if (size > 2 || size < 0)
size = 1;
m_config.setFontSize( size );
QFont *currentFont;
switch (size) {
case 0:
m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
currentFont = new QFont (m_abView->font());
@@ -316,102 +316,102 @@ void AddressbookWindow::slotSetFont( int size )
void AddressbookWindow::importvCard() {
QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
if(!str.isEmpty() ){
setDocument((const QString&) str );
}
}
void AddressbookWindow::exportvCard()
{
- qWarning(" void AddressbookWindow::exportvCard()");
+ Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){
- qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
+ Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
Opie::OPimContact curCont = m_abView->currentEntry();
if ( !curCont.isEmpty() ){
Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
filename );
Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
if ( access ){
access->add( curCont );
access->save();
}
delete access;
}else
QMessageBox::critical( 0, "Export VCard",
QString( tr( "You have to select a contact !") ) );
}else
QMessageBox::critical( 0, "Export VCard",
QString( tr( "You have to set a filename !") ) );
}
void AddressbookWindow::setDocument( const QString &filename )
{
- qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
+ Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
if ( filename.find(".vcf") != int(filename.length()) - 4 ){
switch( QMessageBox::information( this, tr ( "Right file type ?" ),
tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
tr( "&Yes" ), tr( "&No" ), QString::null,
0, // Enter == button 0
2 ) ) { // Escape == button 2
case 0:
- qWarning("YES clicked");
+ Opie::Core::owarn << "YES clicked" << oendl;
break;
case 1:
- qWarning("NO clicked");
+ Opie::Core::owarn << "NO clicked" << oendl;
return;
break;
}
}
Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
filename );
Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
Opie::OPimContactAccess::List allList = access->allRecords();
- qWarning( "Found number of contacts in File: %d", allList.count() );
+ Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
if ( !allList.count() ) {
QMessageBox::information( this, "Import VCard",
"It was impossible to import\nthe VCard.\n"
"The VCard may be corrupted!" );
}
bool doAsk = true;
Opie::OPimContactAccess::List::Iterator it;
for ( it = allList.begin(); it != allList.end(); ++it ){
- qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
+ Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
if ( doAsk ){
switch( QMessageBox::information( this, tr ( "Add Contact?" ),
tr( "Do you really want add contact for \n%1?" )
.arg( (*it).fullName().latin1() ),
tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
0, // Enter == button 0
2 ) ) { // Escape == button 2
case 0:
- qWarning("YES clicked");
+ Opie::Core::owarn << "YES clicked" << oendl;
m_abView->addEntry( *it );
break;
case 1:
- qWarning("NO clicked");
+ Opie::Core::owarn << "NO clicked" << oendl;
break;
case 2:
- qWarning("YesAll clicked");
+ Opie::Core::owarn << "YesAll clicked" << oendl;
doAsk = false;
break;
}
}else
m_abView->addEntry( *it );
}
delete access;
}
void AddressbookWindow::resizeEvent( QResizeEvent *e )
@@ -529,37 +529,37 @@ void AddressbookWindow::writeMail()
QString name = c.fileAs();
QString email = c.defaultEmail();
// I prefer the OPIE-Environment variable before the
// QPE-one..
QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
if ( basepath.isEmpty() )
basepath = QString::fromLatin1( getenv("QPEDIR") );
// Try to access the preferred. If not possible, try to
// switch to the other one..
if ( m_config.useQtMail() ){
- qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
- if ( QFile::exists( basepath + "/bin/qtmail" ) ){
- qWarning ("QCop");
+ Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+ if ( QFile::exists( basepath + "/bin/qtmail" ) ){
+ Opie::Core::owarn << "QCop" << oendl;
QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
e << name << email;
return;
} else
m_config.setUseOpieMail( true );
}
if ( m_config.useOpieMail() ){
- qWarning ("Accessing: %s", (basepath + "/bin/opiemail").latin1());
+ Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
if ( QFile::exists( basepath + "/bin/opiemail" ) ){
- qWarning ("QCop");
+ Opie::Core::owarn << "QCop" << oendl;
QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
e << name << email;
return;
} else
m_config.setUseQtMail( true );
}
}
static const char * beamfile = "/tmp/obex/contact.vcf";
void AddressbookWindow::slotBeam()
@@ -583,25 +583,25 @@ void AddressbookWindow::slotBeam()
mkdir("/tmp/obex/", 0755);
c = m_abView -> currentEntry();
Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
beamfile );
Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
access->add( c );
access->save();
delete access;
beamFilename = beamfile;
}
- qWarning("Beaming: %s", beamFilename.latin1() );
+ Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
Ir *ir = new Ir( this );
connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
QString description = c.fullName();
ir->send( beamFilename, description, "text/x-vCard" );
}
void AddressbookWindow::beamDone( Ir *ir )
{
delete ir;
unlink( beamfile );
@@ -630,41 +630,41 @@ static void parseName( const QString& name, QString *first, QString *middle,
*first = rest;
} else {
*first = rest.left( space );
*middle = rest.mid( space+1 );
}
}
void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
{
bool needShow = FALSE;
- qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+ Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
if (msg == "editPersonal()") {
editPersonal();
} else if (msg == "editPersonalAndClose()") {
editPersonal();
close();
} else if ( msg == "addContact(QString,QString)" ) {
QDataStream stream(data,IO_ReadOnly);
QString name, email;
stream >> name >> email;
Opie::OPimContact cnt;
QString fn, mn, ln;
parseName( name, &fn, &mn, &ln );
- // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
+ // Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
cnt.setFirstName( fn );
cnt.setMiddleName( mn );
cnt.setLastName( ln );
cnt.insertEmails( email );
cnt.setDefaultEmail( email );
cnt.setFileAs();
m_abView -> addEntry( cnt );
// :SXm_abView()->init( cnt );
editEntry( EditEntry );
} else if ( msg == "beamBusinessCard()" ) {
@@ -673,25 +673,25 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
return; // can't beam a non-existent file
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 );
+ Opie::Core::owarn << "Showing uid: " << uid << oendl;
// Deactivate Personal View..
if ( actionPersonal->isOn() ){
actionPersonal->setOn( false );
slotPersonalView();
}
// Reset category and show as card..
m_abView -> setShowByCategory( QString::null );
m_abView -> setCurrentUid( uid );
slotViewSwitched ( AbView::CardView );
@@ -753,60 +753,60 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
}
// populateCategories();
}
void AddressbookWindow::editPersonal()
{
Opie::OPimContact entry;
// Switch to personal view if not selected
// but take care of the menu, too
if ( ! actionPersonal->isOn() ){
- qWarning("*** ++++");
+ Opie::Core::owarn << "*** ++++" << oendl;
actionPersonal->setOn( true );
slotPersonalView();
}
if ( !abEditor ) {
abEditor = new ContactEditor( entry, this, "editor" );
}
abEditor->setCaption(tr("Edit My Personal Details"));
abEditor->setPersonalView( true );
editEntry( EditEntry );
abEditor->setPersonalView( false );
}
void AddressbookWindow::slotPersonalView()
{
- qWarning("slotPersonalView()");
+ Opie::Core::owarn << "slotPersonalView()" << oendl;
if (!actionPersonal->isOn()) {
// we just turned it off
- qWarning("slotPersonalView()-> OFF");
+ Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
setCaption( tr("Contacts") );
actionNew->setEnabled(TRUE);
actionTrash->setEnabled(TRUE);
actionFind->setEnabled(TRUE);
actionMail->setEnabled(TRUE);
// slotUpdateToolbar();
m_abView->showPersonal( false );
return;
}
- qWarning("slotPersonalView()-> ON");
+ Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
// XXX need to disable some QActions.
actionNew->setEnabled(FALSE);
actionTrash->setEnabled(FALSE);
actionFind->setEnabled(FALSE);
actionMail->setEnabled(FALSE);
setCaption( tr("Contacts - My Personal Details") );
m_abView->showPersonal( true );
}
@@ -878,42 +878,43 @@ bool AddressbookWindow::save()
}
#ifdef __DEBUG_RELEASE
void AddressbookWindow::slotSave()
{
save();
}
#endif
void AddressbookWindow::slotNotFound()
{
- qWarning("Got notfound signal!");
+ Opie::Core::owarn << "Got not found signal!" << oendl;
QMessageBox::information( this, tr( "Not Found" ),
"<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
}
void AddressbookWindow::slotWrapAround()
{
- qWarning("Got wrap signal!");
+ Opie::Core::owarn << "Got wrap signal!" << oendl;
// if ( doNotifyWrapAround )
// QMessageBox::information( this, tr( "End of list" ),
// tr( "End of list. Wrap around now...!" ) + "\n" );
}
void AddressbookWindow::slotSetCategory( int c )
{
- qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() );
+ Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+ << catMenu->count() << oendl;
QString cat, book;
AbView::Views view = AbView::TableView;
if ( c <= 0 )
return;
// Switch view
if ( c < 3 )
for ( unsigned int i = 1; i < 3; i++ ){
if ( catMenu )
catMenu->setItemChecked( i, c == (int)i );
@@ -930,48 +931,48 @@ void AddressbookWindow::slotSetCategory( int c )
book = QString::null;
view = AbView::TableView;
}else if ( i == 2 ){
book = tr( "Cards" );
view = AbView::CardView;
// }else if ( i == 3 ){
// 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!");
+ Opie::Core::owarn << "Unfiled selected!" << oendl;
}else{
cat = m_abView->categories()[i - 4];
}
}
}
// Switch to the selected View
slotViewSwitched( view );
// Tell the view about the selected category
m_abView -> setShowByCategory( cat );
if ( book.isEmpty() )
book = "List";
if ( cat.isEmpty() )
cat = "All";
setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
}
void AddressbookWindow::slotViewSwitched( int view )
{
- qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view );
+ Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
int menu = 0;
// Switch to selected view
switch ( view ){
case AbView::TableView:
menu = 1;
m_tableViewButton->setOn(true);
m_cardViewButton->setOn(false);
break;
case AbView::CardView:
menu = 2;
m_tableViewButton->setOn(false);
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 6c98b5d..094dbda 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,14 +1,15 @@
#include "configdlg.h"
+#include <opie2/odebug.h>
#include <opie2/opimcontact.h>
#include "opie2/opimcontactfields.h"
#include <qpe/resource.h>
#include <qcheckbox.h>
#include <qradiobutton.h>
#include <qlistbox.h>
#include <qpushbutton.h>
ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
ConfigDlg_Base(parent, name, true )
@@ -33,64 +34,64 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
// Get the translation maps between Field ID and translated strings
m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
}
void ConfigDlg::slotItemUp()
{
- qWarning( "void ConfigDlg::slotItemUp()" );
+ Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
int i = fieldListBox->currentItem();
if ( i > 0 ) {
QString item = fieldListBox->currentText();
fieldListBox->removeItem( i );
fieldListBox->insertItem( item, i-1 );
fieldListBox->setCurrentItem( i-1 );
}
}
void ConfigDlg::slotItemDown()
{
- qWarning( "void ConfigDlg::slotItemDown()" );
+ Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
int i = fieldListBox->currentItem();
if ( i < (int)fieldListBox->count() - 1 ) {
QString item = fieldListBox->currentText();
fieldListBox->removeItem( i );
fieldListBox->insertItem( item, i+1 );
fieldListBox->setCurrentItem( i+1 );
}
}
void ConfigDlg::slotItemAdd()
{
- qWarning( "void ConfigDlg::slotItemAdd()" );
+ Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
int i = allFieldListBox->currentItem();
if ( i > 0 ) {
QString item = allFieldListBox->currentText();
- qWarning("ADding %s", item.latin1());
+ Opie::Core::owarn << "Adding " << item << oendl;
fieldListBox->insertItem( item );
}
}
void ConfigDlg::slotItemRemove()
{
- qWarning( "void ConfigDlg::slotItemRemove()" );
+ Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
int i = fieldListBox->currentItem();
if ( i > 0 ) {
fieldListBox->removeItem( i );
}
}
void ConfigDlg::setConfig( const AbConfig& cnf )
{
m_config = cnf;
m_useRegExp->setChecked( m_config.useRegExp() );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 534666d..e496387 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -12,24 +12,25 @@
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*
* This is a rewrite of the abeditor.h file, modified to provide a more
* intuitive interface to TrollTech's original Address Book editor. This
* is made to operate exactly in interface with the exception of name.
*
*/
#include "contacteditor.h"
+#include <opie2/odebug.h>
#include <opie2/opimcontact.h>
#include <qpe/categoryselect.h>
#include <qpe/qpeapplication.h>
#include <qpe/qpedialog.h>
#include <qpe/resource.h>
#include <qlabel.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qmultilineedit.h>
@@ -68,25 +69,25 @@ ContactEditor::ContactEditor( const Opie::OPimContact &entry,
init();
setEntry( entry );
// cmbDefaultEmail = 0;
// defaultEmailChooserPosition = -1;
initializing = false;
}
ContactEditor::~ContactEditor() {
}
void ContactEditor::init() {
- qWarning("init() START");
+ Opie::Core::owarn << "init() START" << oendl;
uint i = 0;
QStringList trlChooserNames;
for (i = 0; i <= 6; i++) {
slHomeAddress.append( "" );
slBusinessAddress.append( "" );
}
trlChooserNames = Opie::OPimContactFields::trphonefields( false );
slChooserNames = Opie::OPimContactFields::untrphonefields( false );
@@ -677,83 +678,85 @@ void ContactEditor::init() {
this, SLOT(slotCmbChooser2Change(int)) );
connect( cmbChooserField3, SIGNAL(activated(int)),
this, SLOT(slotCmbChooser3Change(int)) );
connect( cmbChooserField4, SIGNAL(activated(int)),
this, SLOT(slotCmbChooser4Change(int)) );
connect( cmbAddress, SIGNAL(activated(int)),
this, SLOT(slotAddressTypeChange(int)) );
new QPEDialogListener(this);
setPersonalView ( m_personalView );
- qWarning("init() END");
+ Opie::Core::owarn << "init() END" << oendl;
}
void ContactEditor::defaultEmailChanged(int i){
- qDebug("defaultEmailChanged");
+ Opie::Core::odebug << "defaultEmailChanged" << oendl;
// was sollte das ? (se)
// int index = cmbChooserField1->currentItem();
// slChooserValues[index] = cmbDefaultEmail->text(i);
defaultEmail = cmbDefaultEmail->text(i);
- qDebug ("Changed to: %s", defaultEmail.latin1());
+ Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
}
void ContactEditor::populateDefaultEmailCmb(){
// if the default-email combo was not selected and therfore not created
// we get a lot of trouble.. Therfore create an invisible one..
if ( !cmbDefaultEmail ){
cmbDefaultEmail = new QComboBox(this);
cmbDefaultEmail -> hide();
}
cmbDefaultEmail->clear();
cmbDefaultEmail->insertStringList( emails );
// cmbDefaultEmail->show();
// Select default email in combo..
bool found = false;
for ( int i = 0; i < cmbDefaultEmail->count(); i++){
- qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
- cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
+ Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+ << "< defaultEmail >" << defaultEmail << "<" << oendl;
if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
cmbDefaultEmail->setCurrentItem( i );
- qDebug("set");
+ Opie::Core::odebug << "set" << oendl;
found = true;
}
}
// If the current default email is not found in the list, we choose the
// first one..
if ( !found )
defaultEmail = cmbDefaultEmail->text(0);
}
// Called when any combobox was changed.
// "true" returned if the change was chandled by this function, else it should
// be handled by something else..
bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
QString type = slChooserNames[index];
- qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
+ Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+ << ", WidgetPos: " << widgetPos << oendl;
if ( !initializing )
contactfields.setFieldOrder( widgetPos-1, index );
// Create and connect combobox for selecting the default email
if ( type == "Default Email"){
- qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
+ Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+ << defaultEmailChooserPosition << ") " << oendl;
// More than one default-email chooser is not allowed !
if ( ( defaultEmailChooserPosition != -1 ) &&
defaultEmailChooserPosition != widgetPos && !initializing){
chooserError( widgetPos );
return true;
}
QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
if ( cmbo ){
inputStack->raiseWidget( TextField );
inputStack -> removeWidget( cmbo );
@@ -768,50 +771,50 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
defaultEmailChooserPosition = widgetPos;
cmbDefaultEmail = cmbo;
connect( cmbo,SIGNAL( activated(int) ),
SLOT( defaultEmailChanged(int) ) );
// Set current default email
populateDefaultEmailCmb();
} else {
// Something else was selected: Hide combo..
- qWarning(" Hiding default-email combo" );
+ Opie::Core::owarn << " Hiding default-email combo" << oendl;
if ( defaultEmailChooserPosition == widgetPos ){
defaultEmailChooserPosition = -1;
}
QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
if ( cmbo ){
inputStack->raiseWidget( TextField );
inputStack -> removeWidget( cmbo );
cmbDefaultEmail = 0l;
delete cmbo;
}
// Caller should initialize the responsible textfield, therefore
// "false" is returned
return false;
}
// Everything is worked off ..
return true;
}
// Currently accessed when we select default-email more than once !
void ContactEditor::chooserError( int index )
{
- qWarning("ContactEditor::chooserError( %d )", index);
+ Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
QMessageBox::warning( this, "Chooser Error",
"Multiple selection of this\n"
"Item is not allowed !\n\n"
"First deselect the previous one !",
"&OK", 0, 0,
0, 0 );
// Reset the selected Chooser. Unfortunately the chooser
// generates no signal, therfore we have to
// call the cmbChooserChange function manually..
switch( index ){
case 1:
@@ -829,64 +832,65 @@ void ContactEditor::chooserError( int index )
case 4:
cmbChooserField4 -> setCurrentItem( 0 );
slotCmbChooser4Change( 0 );
break;
}
}
// Called when something was changed in a textfield (shouldn't it called textchanged? (se))
void ContactEditor::chooserChange( const QString &textChanged, int index,
QLineEdit* , int widgetPos ) {
QString type = slChooserNames[index]; // :SX
- qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",
- type.latin1(),textChanged.latin1(), index, widgetPos );
+ Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+ << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
+ << " )" << oendl;
if ( type == "Default Email"){
- qWarning ("??? Wozu??: %s", textChanged.latin1());
+ Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
defaultEmail = textChanged;
populateDefaultEmailCmb();
}else if (type == "Emails"){
- qDebug("emails");
+ Opie::Core::odebug << "emails" << oendl;
QString de;
emails = QStringList::split (",", textChanged );
populateDefaultEmailCmb();
}
slChooserValues[index] = textChanged;
}
void ContactEditor::slotChooser1Change( const QString &textChanged ) {
- qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1());
+ Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
}
void ContactEditor::slotChooser2Change( const QString &textChanged ) {
- qWarning("ContactEditor::slotChooser2Change( %s )", textChanged.latin1());
+ Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
}
void ContactEditor::slotChooser3Change( const QString &textChanged ) {
- qWarning("ContactEditor::slotChooser3Change( %s )", textChanged.latin1());
+ Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
}
void ContactEditor::slotChooser4Change( const QString &textChanged ) {
- qWarning("ContactEditor::slotChooser4Change( %s )", textChanged.latin1());
+ Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
}
void ContactEditor::slotAddressChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[0] = textChanged;
} else {
slHomeAddress[0] = textChanged;
}
}
@@ -938,58 +942,58 @@ void ContactEditor::slotZipChange( const QString &textChanged ) {
void ContactEditor::slotCountryChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[6] = textChanged;
} else {
slHomeAddress[6] = textChanged;
}
}
void ContactEditor::slotCmbChooser1Change( int index ) {
- qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
+ Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
txtChooserField1->setText( slChooserValues[index] );
txtChooserField1->setFocus();
}
}
void ContactEditor::slotCmbChooser2Change( int index ) {
- qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+ Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
txtChooserField2->setText( slChooserValues[index] );
txtChooserField2->setFocus();
}
}
void ContactEditor::slotCmbChooser3Change( int index ) {
- qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+ Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
txtChooserField3->setText( slChooserValues[index] );
txtChooserField3->setFocus();
}
}
void ContactEditor::slotCmbChooser4Change( int index ) {
- qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+ Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
txtChooserField4->setText( slChooserValues[index] );
txtChooserField4->setFocus();
}
}
void ContactEditor::slotAddressTypeChange( int index ) {
@@ -1016,49 +1020,49 @@ void ContactEditor::slotAddressTypeChange( int index ) {
txtCity->setText( slHomeAddress[3] );
txtState->setText( slHomeAddress[4] );
txtZip->setText( slHomeAddress[5] );
QLineEdit *txtTmp = cmbCountry->lineEdit();
txtTmp->setText( slHomeAddress[6] );
}
}
void ContactEditor::slotFullNameChange( const QString &textChanged ) {
- qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
+ Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
int index = cmbFileAs->currentItem();
cmbFileAs->clear();
cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) );
if ( ! txtSuffix->text().isEmpty() )
cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) + " " + txtSuffix->text() );
cmbFileAs->setCurrentItem( index );
}
void ContactEditor::slotSuffixChange( const QString& ) {
// Just want to update the FileAs combo if the suffix was changed..
slotFullNameChange( txtFullName->text() );
}
void ContactEditor::slotOrganizationChange( const QString &textChanged ){
- qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
+ Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
// Special handling for storing Companies:
// If no Fullname is given, we store the Company-Name as lastname
// to handle it like a person..
if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
txtFullName->setText( textChanged );
}
void ContactEditor::accept() {
if ( isEmpty() ) {
cleanupFields();
@@ -1122,38 +1126,38 @@ bool ContactEditor::isEmpty() {
}
QString ContactEditor::parseName( const QString fullName, int type ) {
QString simplifiedName( fullName.simplifyWhiteSpace() );
QString strFirstName;
QString strMiddleName;
QString strLastName;
QString strTitle;
int commapos;
bool haveLastName = false;
- qWarning("Fullname: %s", simplifiedName.latin1());
+ Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
commapos = simplifiedName.find( ',', 0, TRUE);
if ( commapos >= 0 ) {
- qWarning(" Commapos: %d", commapos );
+ Opie::Core::owarn << " Commapos: " << commapos << oendl;
// A comma (",") separates the lastname from one or
// many first names. Thus, remove the lastname from the
// String and parse the firstnames.
strLastName = simplifiedName.left( commapos );
simplifiedName= simplifiedName.mid( commapos + 1 );
haveLastName = true;
- qWarning("Fullname without ',': %s", simplifiedName.latin1());
+ Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
// If we have any lastname, we should now split all first names.
// The first one will be the used as first, the rest as "middle names"
QStringList allFirstNames = QStringList::split(" ", simplifiedName);
QStringList::Iterator it = allFirstNames.begin();
strFirstName = *it++;
QStringList allSecondNames;
for ( ; it != allFirstNames.end(); ++it )
allSecondNames.append( *it );
strMiddleName = allSecondNames.join(" ");
@@ -1169,28 +1173,28 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
QStringList allSecondNames;
for ( ; it != --allNames.end(); ++it )
allSecondNames.append( *it );
strMiddleName = allSecondNames.join(" ");
strLastName = *(--allNames.end());
}
if ( strFirstName == strLastName )
strFirstName = "";
- qWarning(" strFirstName: %s", strFirstName.latin1());
- qWarning(" strMiddleName: %s", strMiddleName.latin1());
- qWarning(" strLastName: %s", strLastName.latin1());
- qWarning(" strTitle: %s", strTitle.latin1());
+ Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
+ Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
+ Opie::Core::owarn << "strLastName: " << strLastName << oendl;
+ Opie::Core::owarn << "strTitle: " << strTitle << oendl;
switch (type) {
case NAME_FL:
return strFirstName + " " + strLastName;
case NAME_LF:
return strLastName + ", " + strFirstName;
case NAME_LFM:
return strLastName + ", " + strFirstName + " " + strMiddleName;
case NAME_FML:
@@ -1255,25 +1259,25 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
initializing = true;
// Cleanup and activate the general Page ..
cleanupFields();
tabMain->setCurrentPage( 0 );
ent = entry;
emails = QStringList(ent.emailList());
defaultEmail = ent.defaultEmail();
if (defaultEmail.isEmpty()) defaultEmail = emails[0];
- qDebug("default email=%s",defaultEmail.latin1());
+ Opie::Core::odebug << "default email=" << defaultEmail << oendl;
txtFirstName->setText( ent.firstName() );
txtMiddleName->setText( ent.middleName() );
txtLastName->setText( ent.lastName() );
txtSuffix->setText( ent.suffix() );
// QString *tmpString = new QString;
// *tmpString = ent.firstName() + " " + ent.middleName() +
// + " " + ent.lastName() + " " + ent.suffix();
// txtFullName->setText( tmpString->simplifyWhiteSpace() );
if ( !ent.isEmpty() ){
@@ -1315,49 +1319,49 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
slBusinessAddress[5] = ent.businessZip();
//}
//if (hasCountry) {
slHomeAddress[6] = ent.homeCountry();
slBusinessAddress[6] = ent.businessCountry();
//}
QStringList::ConstIterator it;
QListIterator<QLineEdit> itLE( listValue );
for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
- qWarning(" Filling dynamic Field: %s", (*it).latin1() );
+ Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
if ( *it == "Department" )
(*itLE)->setText( ent.department() );
if ( *it == "Company" )
(*itLE)->setText( ent.company() );
if ( *it == "Office" )
(*itLE)->setText( ent.office() );
if ( *it == "Profession" )
(*itLE)->setText( ent.profession() );
if ( *it == "Assistant" )
(*itLE)->setText( ent.assistant() );
if ( *it == "Manager" )
(*itLE)->setText( ent.manager() );
if ( *it == "Spouse" )
(*itLE)->setText( ent.spouse() );
if ( *it == "Nickname" ){
- qWarning("**** Nichname: %s", ent.nickname().latin1() );
+ Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
(*itLE)->setText( ent.nickname() );
}
if ( *it == "Children" )
(*itLE)->setText( ent.children() );
}
QStringList::Iterator itV;
for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) )
@@ -1572,26 +1576,26 @@ void ContactEditor::saveEntry() {
if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
ent.setBusinessFax( *itV );
if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
ent.setBusinessMobile( *itV );
if ( *it == "Emails" ){
QString allemail;
QString defaultmail;
parseEmailFrom( emails.join(","), defaultmail, allemail );
if ( defaultEmail.isEmpty() ){
- qWarning("Default email was not set by user!");
- qWarning("Using first email in list: %s", defaultmail.latin1());
+ Opie::Core::owarn << "Default email was not set by user!" << oendl;
+ Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
ent.setDefaultEmail( defaultmail );
}
ent.setEmails( allemail );
}
if ( *it == "Default Email")
ent.setDefaultEmail( defaultEmail /* *itV */ );
if ( *it == "Home Phone" )
ent.setHomePhone( *itV );
if ( *it == "Home Fax" )
@@ -1725,23 +1729,23 @@ void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
{
QDate date;
date.setYMD( year, month, day );
QString dateString = TimeString::numberDateString( date );
birthdayButton->setText( dateString );
ent.setBirthday ( date );
}
void ContactEditor::slotRemoveBirthday()
{
- qWarning("void ContactEditor::slotRemoveBirthday()");
+ Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
ent.setBirthday( QDate() );
updateDatePicker();
}
void ContactEditor::slotRemoveAnniversary()
{
- qWarning("void ContactEditor::slotRemoveAnniversary()");
+ Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
ent.setAnniversary( QDate() );
updateDatePicker();
}
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 18a3791..882bdf3 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,11 +1,11 @@
Package: opie-addressbook
Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
Priority: optional
Section: opie/pim
Conflicts: qpe-tkcaddressbook
Maintainer: Stefan Eilers <eilers.stefan@epost.de>
Architecture: arm
-Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2
+Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2
Description: Contacts
A simple addressbook for the Opie environment.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 7a20591..df3d6ac 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -1,104 +1,106 @@
#include "picker.h"
+#include <opie2/odebug.h>
+
#include <qtimer.h>
#include <qlayout.h>
char PickerLabel::lastLetter = '\0';
-PickerLabel::PickerLabel( QWidget *parent, const char *name )
+PickerLabel::PickerLabel( QWidget *parent, const char *name )
: QLabel ( parent, name )
{
currentLetter = 0;
//lastLetter = 0;
letter1 = '\0';
letter2 = '\0';
letter3 = '\0';
// setFont( QFont( "smallsmooth", 9 ) );
setFont( QFont::defaultFont() );
setTextFormat( Qt::RichText );
}
PickerLabel::~PickerLabel()
{
}
void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
{
QString tmpStr;
- if (ch1 != '\0')
+ if (ch1 != '\0')
letter1 = ch1;
else
letter1 = ' ';
- if (ch2 != '\0')
+ if (ch2 != '\0')
letter2 = ch2;
else
letter2 = ' ';
- if (ch3 != '\0')
+ if (ch3 != '\0')
letter3 = ch3;
else
letter3 = ' ';
tmpStr = "<qt>";
tmpStr += letter1;
tmpStr += letter2;
tmpStr += letter3;
tmpStr += "</qt>";
setText(tmpStr);
currentLetter = 0;
}
void PickerLabel::clearLetter()
{
QString tmpStr;
-
+
tmpStr = "<qt>";
tmpStr += letter1;
tmpStr += letter2;
tmpStr += letter3;
tmpStr += "</qt>";
setText(tmpStr);
currentLetter = 0;
}
void PickerLabel::mousePressEvent( QMouseEvent* e )
{
- // If one pickerlabel is was, and an other is now selected, we
+ // If one pickerlabel is was, and an other is now selected, we
// have to simulate the releaseevent.. Otherwise the new label
- // will not get a highlighted letter..
+ // will not get a highlighted letter..
// Maybe there is a more intelligent solution, but this works and I am tired.. (se)
if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e );
-}
+}
void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
{
QString tmpStr;
if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
-
+
switch (currentLetter) {
case 0:
tmpStr = "<qt><u><b><font color=\"#FF00FF\">";
tmpStr += letter1;
tmpStr += "</font></b></u>";
tmpStr += letter2;
tmpStr += letter3;
tmpStr += "</qt>";
setText(tmpStr);
currentLetter++;
@@ -112,25 +114,25 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
tmpStr += "<u><b><font color=\"#FF00FF\">";
tmpStr += letter2;
tmpStr += "</font></b></u>";
tmpStr += letter3;
tmpStr += "</qt>";
setText(tmpStr);
currentLetter++;
lastLetter = letter2;
emit selectedLetter( letter2 );
break;
-
+
case 2:
tmpStr = "<qt>";
tmpStr += letter1;
tmpStr += letter2;
tmpStr += "<u><b><font color=\"#FF00FF\">";
tmpStr += letter3;
tmpStr += "</font></b></u></qt>";
setText(tmpStr);
currentLetter++;
lastLetter = letter3;
@@ -140,33 +142,33 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
default:
clearLetter();
lastLetter = '\0';
emit selectedLetter( '\0' );
}
}
void PickerLabel::emitClearSignal() {
emit clearAll();
}
-
+
LetterPicker::LetterPicker( QWidget *parent, const char *name )
: QFrame( parent, name )
{
QHBoxLayout *l = new QHBoxLayout(this);
lblABC = new PickerLabel( this );
l->addWidget( lblABC );
-
+
lblDEF = new PickerLabel( this );
l->addWidget( lblDEF );
lblGHI = new PickerLabel( this );
l->addWidget( lblGHI );
lblJKL = new PickerLabel( this );
l->addWidget( lblJKL );
lblMNO = new PickerLabel( this );
l->addWidget( lblMNO );
@@ -228,16 +230,16 @@ void LetterPicker::clear()
lblDEF->clearLetter();
lblGHI->clearLetter();
lblJKL->clearLetter();
lblMNO->clearLetter();
lblPQR->clearLetter();
lblSTU->clearLetter();
lblVWX->clearLetter();
lblYZ->clearLetter();
}
void LetterPicker::newLetter( char letter )
{
- qWarning("LetterClicked");
+ Opie::Core::owarn << "LetterClicked" << oendl;
emit letterClicked( letter );
}