summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp14
-rw-r--r--core/pim/addressbook/abtable.cpp50
-rw-r--r--core/pim/addressbook/abview.cpp56
-rw-r--r--core/pim/addressbook/addressbook.cpp62
-rw-r--r--core/pim/addressbook/configdlg.cpp10
-rw-r--r--core/pim/addressbook/contacteditor.cpp74
-rw-r--r--core/pim/addressbook/picker.cpp2
7 files changed, 134 insertions, 134 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 8216d6f..b81a3b9 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -74,71 +74,71 @@ bool AbLabel::selectContact( int UID )
break;
}
}
sync();
return true;
}
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:
- Opie::Core::owarn << "Left.." << oendl;
+ owarn << "Left.." << oendl;
case Qt::Key_Right:
- Opie::Core::owarn << "Right.." << oendl;
+ owarn << "Right.." << oendl;
case Qt::Key_F33:
- Opie::Core::owarn << "OK.." << oendl;
+ owarn << "OK.." << oendl;
emit signalOkPressed();
break;
case Qt::Key_Up:
- Opie::Core::owarn << "Up.." << oendl;
+ 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:
- Opie::Core::owarn << "Down.." << oendl;
-// Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
-// Opie::Core::owarn << "Value: " << verticalScrollBar()->value()
+ owarn << "Down.." << oendl;
+// owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
+// 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
case Qt::Key_Space: // fall through
case Qt::Key_Enter: // we want to switch back
emit signalOkPressed();
break;
default: break;
}
}
}
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index cb57342..3fb2214 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -100,285 +100,285 @@ void AbPickItem::setContentFromEditor( QWidget *w )
{
if ( w->inherits("QComboBox") )
setText( ( (QComboBox*)w )->currentText() );
else
QTableItem::setContentFromEditor( w );
}
#endif
/*!
\class AbTable abtable.h
\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 )
{
- // Opie::Core::owarn << "C'tor start" << oendl;
+ // 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();
- // Opie::Core::owarn << "C'tor end" << oendl;
+ // 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 )
{
- Opie::Core::owarn << "AbTable::setContacts()" << oendl;
+ 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++ );
// setSorting( true );
// resort();
updateVisible();
setPaintingEnabled( TRUE );
}
void AbTable::setOrderedList( const QValueList<int> ordered )
{
intFields = ordered;
}
bool AbTable::selectContact( int UID )
{
- Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl;
+ owarn << "AbTable::selectContact( " << UID << " )" << oendl;
int rows = numRows();
Opie::OPimContact* foundContact = 0l;
bool found = false;
setPaintingEnabled( FALSE );
- Opie::Core::owarn << "Search start" << oendl;
+ 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;
}
}
- Opie::Core::owarn << "Search end" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
+ 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() )
ati->setPixmap( contactItem.icon );
setItem( row, 1, ati );
//### cannot do this; table only has two columns at this point
// setItem( row, 2, new AbPickItem( this ) );
}
#endif
void AbTable::columnClicked( int col )
{
if ( !sorting() )
return;
if ( lastSortCol == -1 )
lastSortCol = col;
if ( col == lastSortCol ) {
asc = !asc;
} else {
lastSortCol = col;
asc = TRUE;
}
//QMessageBox::information( this, "resort", "columnClicked" );
resort();
}
void AbTable::resort()
{
- Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
+ 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
}
Opie::OPimContact AbTable::currentEntry()
{
return m_viewList[currentRow()];
}
int AbTable::currentEntry_UID()
{
return ( currentEntry().uid() );
}
void AbTable::clear()
{
- Opie::Core::owarn << "void AbTable::clear()" << oendl;
+ 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()
{
- Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl;
+ 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() ){
static_cast<AbTableItem*>( item(r, 1) )->
setPixmap( contactItem.icon );
}else{
static_cast<AbTableItem*>( item(r, 1) )->
setPixmap( QPixmap() );
}
}
resort();
setPaintingEnabled( TRUE );
#endif
}
void AbTable::keyPressEvent( QKeyEvent *e )
{
char key = toupper( e->ascii() );
if ( key >= 'A' && key <= 'Z' )
moveTo( key );
- // Opie::Core::owarn << "Received key .." << oendl;
+ // 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:
-// Opie::Core::owarn << "a" << oendl;
+// owarn << "a" << oendl;
// emit signalKeyUp();
// break;
// case Qt::Key_Down:
-// Opie::Core::owarn << "b" << oendl;
+// owarn << "b" << oendl;
// emit signalKeyDown();
// break;
default:
QTable::keyPressEvent( e );
}
}
void AbTable::moveTo( char c )
{
- Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
+ 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???
if ( first.row() || first.cell() >= c )
break;
r++;
}
} else {
//### should probably disable reverse sorting instead
r = rows - 1;
while ( r > 0 ) {
abi = static_cast<AbTableItem*>( item(r, 0) );
QChar first = abi->key()[0];
//### is there a bug in QChar to char comparison???
if ( first.row() || first.cell() >= c )
@@ -402,49 +402,49 @@ QString AbTable::findContactName( const Opie::OPimContact &entry )
str = entry.company();
if ( str.isEmpty() ) {
str = entry.defaultEmail();
}
}
return str;
}
#endif
void AbTable::resizeRows() {
/*
if (numRows()) {
for (int i = 0; i < numRows(); i++) {
setRowHeight( i, size );
}
}
updateVisible();
*/
}
void AbTable::realignTable()
{
- // Opie::Core::owarn << "void AbTable::realignTable()" << oendl;
+ // owarn << "void AbTable::realignTable()" << oendl;
setPaintingEnabled( FALSE );
resizeRows();
fitColumns();
setPaintingEnabled( TRUE );
}
#if QT_VERSION <= 230
#ifndef SINGLE_APP
void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
{
// Region of the rect we should draw
QRegion reg( QRect( cx, cy, cw, ch ) );
// Subtract the table from it
reg = reg.subtract( QRect( QPoint( 0, 0 ), tableSize() ) );
// And draw the rectangles (transformed as needed)
QArray<QRect> r = reg.rects();
for (unsigned int i=0; i<r.count(); i++)
@@ -452,207 +452,207 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
}
#endif
#endif
// int AbTable::rowHeight( int ) const
// {
// return 18;
// }
// int AbTable::rowPos( int row ) const
// {
// return 18*row;
// }
// int AbTable::rowAt( int pos ) const
// {
// return QMIN( pos/18, numRows()-1 );
// }
void AbTable::fitColumns()
{
- Opie::Core::owarn << "void AbTable::fitColumns()" << oendl;
+ owarn << "void AbTable::fitColumns()" << oendl;
int contentsWidth = visibleWidth() / 2;
// Fix to better value
// contentsWidth = 130;
setPaintingEnabled( FALSE );
if ( columnVisible == false ){
showColumn(0);
columnVisible = true;
}
- // Opie::Core::owarn << "Width: " << contentsWidth << oendl;
+ // owarn << "Width: " << contentsWidth << oendl;
setColumnWidth( 0, contentsWidth );
adjustColumn(1);
if ( columnWidth(1) < contentsWidth )
setColumnWidth( 1, contentsWidth );
setPaintingEnabled( TRUE );
}
void AbTable::show()
{
- // Opie::Core::owarn << "void AbTable::show()" << oendl;
+ // 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)
{
- // Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
+ // owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl;
if ( col == 2 ) {
return;
} else {
- // Opie::Core::owarn << "Emitting signalSwitch()" << oendl;
+ // owarn << "Emitting signalSwitch()" << oendl;
emit signalSwitch();
}
}
#if 0
QStringList AbTable::choiceNames() const
{
return choicenames;
}
#endif
void AbTable::setChoiceSelection( const QValueList<int>& list )
{
intFields = list;
}
QStringList AbTable::choiceSelection(int /*index*/) const
{
QStringList r;
/* ######
QString selname = choicenames.at(index);
for (each row) {
Opie::OPimContact *c = contactForRow(row);
if ( text(row,2) == selname ) {
r.append(c->email);
}
}
*/
return r;
}
void AbTable::updateVisible()
{
- // Opie::Core::owarn << "void AbTable::updateVisible()" << oendl;
+ // owarn << "void AbTable::updateVisible()" << oendl;
int visible,
totalRows,
row,
selectedRow = 0;
visible = 0;
setPaintingEnabled( FALSE );
realignTable();
totalRows = numRows();
for ( row = 0; row < totalRows; row++ ) {
if ( rowHeight(row) == 0 ) {
showRow( row );
adjustRow( row );
if ( isSelected( row,0 ) || isSelected( row,1 ) )
selectedRow = row;
}
visible++;
}
if ( selectedRow )
setCurrentCell( selectedRow, 0 );
if ( !visible )
setCurrentCell( -1, 0 );
setPaintingEnabled( TRUE );
}
void AbTable::setPaintingEnabled( bool e )
{
- // Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+ // 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 );
}
- // Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
+ // owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: "
// << countNested << oendl;
}
void AbTable::viewportPaintEvent( QPaintEvent* e ) {
- // Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> "
+ // 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();
- // Opie::Core::owarn << "Paint row: " << row << oendl;
+ // 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() ) );
}
QFont f = p->font();
QFontMetrics fm(f);
int marg = 2;
int x = 0;
int y = ( cr.height() - 14 ) / 2;
QString nameText = act_contact.fileAs();
switch( col ){
case 0:
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 52e5f59..7a5b6d4 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -31,276 +31,276 @@ extern QString categoryFileName();
QString addressbookPersonalVCardName()
{
QString filename = Global::applicationFileName("addressbook",
"businesscard.vcf");
return filename;
}
AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
QWidget(parent),
mCat(0),
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 )
{
- Opie::Core::owarn << "AbView::c'tor" << oendl;
+ 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 );
m_abTable = new AbTable( m_orderedFields, tableBox, "table" );
m_abTable->setCurrentCell( 0, 0 );
m_abTable->setFocus();
// Add TableView to WidgetStack and raise it
m_viewStack -> addWidget( tableBox , TableView );
// Create CardView and add it to WidgetStack
QVBox* cardBox = new QVBox( m_viewStack );
m_ablabel = new AbLabel( cardBox, "CardView");
m_viewStack -> addWidget( cardBox , CardView );
// Connect views to me
connect ( m_abTable, SIGNAL( signalSwitch(void) ),
this, SLOT( slotSwitch(void) ) );
connect ( m_ablabel, SIGNAL( signalOkPressed(void) ),
this, SLOT( slotSwitch(void) ) );
load();
}
AbView::~AbView()
{
m_contactdb -> save();
delete m_contactdb;
if ( m_storedDB ){
m_storedDB -> save();
delete m_storedDB;
}
}
void AbView::setView( Views view )
{
- Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
+ owarn << "AbView::setView( Views view )" << oendl;
m_curr_View = view;
load();
}
void AbView::addEntry( const Opie::OPimContact &newContact )
{
- Opie::Core::owarn << "AbView::AddContact" << oendl;
+ owarn << "AbView::AddContact" << oendl;
m_contactdb->add ( newContact );
load();
}
void AbView::removeEntry( const int UID )
{
- Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
+ owarn << "AbView;:RemoveContact" << oendl;
m_contactdb->remove( UID );
load();
}
void AbView::replaceEntry( const Opie::OPimContact &contact )
{
- Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
+ 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()
{
- // Opie::Core::owarn << "AbView::Save data" << oendl;
+ // owarn << "AbView::Save data" << oendl;
return m_contactdb->save();
}
void AbView::load()
{
- Opie::Core::owarn << "AbView::Load data" << oendl;
+ 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();
}
- Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
+ owarn << "Number of contacts: " << m_list.count() << oendl;
updateView( true );
}
void AbView::reload()
{
- Opie::Core::owarn << "AbView::::reload()" << oendl;
+ owarn << "AbView::::reload()" << oendl;
m_contactdb->reload();
load();
}
void AbView::clear()
{
// :SX
}
void AbView::setShowByCategory( const QString& cat )
{
- Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
+ 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 ){
- // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
+ // owarn << "Categories: Selected " << cat << ".. Number: "
// << m_curr_category << oendl;
m_curr_category = intCat;
emit signalClearLetterPicker();
load();
}
}
void AbView::setShowToView( Views view )
{
- Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
+ owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
if ( m_curr_View != view ){
- Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
+ 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:
- Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
+ 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 )
{
m_orderedFields = ordered;
if ( m_abTable ){
m_abTable->setOrderedList( ordered );
m_abTable->refresh();
}
updateView();
}
QString AbView::showCategory() const
{
return mCat.label( "Contacts", m_curr_category );
}
void AbView::showPersonal( bool personal )
{
- Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
+ 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,
addressbookPersonalVCardName() );
m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
m_inPersonal = true;
m_curr_View = CardView;
}else{
if ( !m_inPersonal )
return;
// Remove vCard Backend and restore default
@@ -314,170 +314,170 @@ void AbView::showPersonal( bool personal )
m_inPersonal = false;
}
load();
}
void AbView::setCurrentUid( int uid ){
m_curr_Contact = uid;
updateView( true ); //true: Don't modificate the 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 )
{
- // Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
+ // 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 );
}
- // Opie::Core::owarn << "Find in Category " << category << oendl;
+ // 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 );
- // Opie::Core::owarn << "Found: " << m_list.count() << oendl;
+ // 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(){
- // Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
+ // owarn << "AbView::slotSwitch()" << oendl;
m_prev_View = m_curr_View;
switch ( (int) m_curr_View ){
case TableView:
- Opie::Core::owarn << "Switching to CardView" << oendl;
+ owarn << "Switching to CardView" << oendl;
m_curr_View = CardView;
break;
case CardView:
- Opie::Core::owarn << "Switching to TableView" << oendl;
+ 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 ) ){
- //Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
+ //owarn << "Removing " << (*it).uid() << oendl;
m_list.remove( (*it).uid() );
}
}
}
}
bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
{
- // Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
+ // owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
// << category << " )" << oendl;
bool returnMe;
QArray<int> cats;
cats = cnt.categories();
- // Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
+ // 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++ ) {
- //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
+ //owarn << "Comparing " << cats[i] << " with " << category << oendl;
if ( cats[i] == category ) {
returnMe = true;
break;
}
}
}
- // Opie::Core::owarn << "Return: " << returnMe << oendl;
+ // 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 )
{
- // Opie::Core::owarn << "AbView::updateView()" << oendl;
+ // 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;
case CardView:
m_curr_Contact = m_ablabel -> currentEntry_UID();
break;
}
}else
m_curr_Contact = 0;
}
// Feed all views with new lists
if ( newdata )
updateListinViews();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 94c0a13..35d0f41 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -230,200 +230,200 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
this, SLOT( slotViewSwitched(int) ) );
QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
// m_abView->load(); // Already done by c'tor .
// Letter Picker
pLabel = new LetterPicker( listContainer );
connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) );
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);
- // Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
+ // 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 ) ) {
- Opie::Core::owarn << "Config Dialog accepted!" << oendl;
+ owarn << "Config Dialog accepted!" << oendl;
m_config = dlg -> getConfig();
if ( m_curFontSize != m_config.fontSize() ){
- Opie::Core::owarn << "Font was changed!" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
+ 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());
// abList->resizeRows(currentFont->pixelSize() + 7); :SX
// abList->resizeRows();
break;
case 1:
m_abView->setFont( *defaultFont );
currentFont = new QFont (m_abView->font());
// // abList->resizeRows(currentFont->pixelSize() + 7);
// abList->resizeRows();
break;
case 2:
m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
currentFont = new QFont (m_abView->font());
// //abList->resizeRows(currentFont->pixelSize() + 7);
// abList->resizeRows();
break;
}
}
void AddressbookWindow::importvCard() {
QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
if(!str.isEmpty() ){
setDocument((const QString&) str );
}
}
void AddressbookWindow::exportvCard()
{
- Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
+ owarn << "void AddressbookWindow::exportvCard()" << oendl;
QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){
- Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
+ 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:
- Opie::Core::owarn << "YES clicked" << oendl;
+ owarn << "YES clicked" << oendl;
break;
case 1:
- Opie::Core::owarn << "NO clicked" << oendl;
+ 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();
- Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
+ 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 ){
- Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
+ 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:
- Opie::Core::owarn << "YES clicked" << oendl;
+ owarn << "YES clicked" << oendl;
m_abView->addEntry( *it );
break;
case 1:
- Opie::Core::owarn << "NO clicked" << oendl;
+ owarn << "NO clicked" << oendl;
break;
case 2:
- Opie::Core::owarn << "YesAll clicked" << oendl;
+ owarn << "YesAll clicked" << oendl;
doAsk = false;
break;
}
}else
m_abView->addEntry( *it );
}
delete access;
}
void AddressbookWindow::resizeEvent( QResizeEvent *e )
{
QMainWindow::resizeEvent( e );
}
AddressbookWindow::~AddressbookWindow()
{
ToolBarDock dock;
int dummy;
bool bDummy;
getLocation ( listTools, dock, dummy, bDummy, dummy );
@@ -517,193 +517,193 @@ void AddressbookWindow::slotViewEdit()
}
} else {
QMessageBox::warning( this, tr("Contacts"),
tr("Can not edit data, currently syncing") );
}
}
void AddressbookWindow::writeMail()
{
Opie::OPimContact c = m_abView -> currentEntry();
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() ){
- Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+ owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
if ( QFile::exists( basepath + "/bin/qtmail" ) ){
- Opie::Core::owarn << "QCop" << oendl;
+ owarn << "QCop" << oendl;
QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
e << name << email;
return;
} else
m_config.setUseOpieMail( true );
}
if ( m_config.useOpieMail() ){
- Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
+ owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
if ( QFile::exists( basepath + "/bin/opiemail" ) ){
- Opie::Core::owarn << "QCop" << oendl;
+ 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()
{
QString beamFilename;
Opie::OPimContact c;
if ( actionPersonal->isOn() ) {
beamFilename = addressbookPersonalVCardName();
if ( !QFile::exists( beamFilename ) )
return; // can't beam a non-existent file
Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
beamFilename );
Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
Opie::OPimContactAccess::List allList = access->allRecords();
Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first
c = *it;
delete access;
} else {
unlink( beamfile ); // delete if exists
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;
}
- Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
+ 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 );
}
static void parseName( const QString& name, QString *first, QString *middle,
QString * last )
{
int comma = name.find ( "," );
QString rest;
if ( comma > 0 ) {
*last = name.left( comma );
comma++;
while ( comma < int(name.length()) && name[comma] == ' ' )
comma++;
rest = name.mid( comma );
} else {
int space = name.findRev( ' ' );
*last = name.mid( space+1 );
rest = name.left( space );
}
int space = rest.find( ' ' );
if ( space <= 0 ) {
*first = rest;
} else {
*first = rest.left( space );
*middle = rest.mid( space+1 );
}
}
void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
{
bool needShow = FALSE;
- Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
+ 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 );
- // Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
+ // 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()" ) {
QString beamFilename = addressbookPersonalVCardName();
if ( !QFile::exists( beamFilename ) )
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;
- Opie::Core::owarn << "Showing uid: " << uid << oendl;
+ 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 );
needShow = true;
} else if ( msg == "edit(int)" ) {
QDataStream stream(data,IO_ReadOnly);
int uid;
stream >> uid;
// Deactivate Personal View..
if ( actionPersonal->isOn() ){
actionPersonal->setOn( false );
slotPersonalView();
@@ -741,84 +741,84 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
Opie::OPimContact insertEntry = abEditor->entry();
insertEntry.assignUid();
m_abView -> addEntry( insertEntry );
m_abView -> setCurrentUid( insertEntry.uid() );
} else {
Opie::OPimContact replEntry = abEditor->entry();
if ( !replEntry.isValidUid() )
replEntry.assignUid();
m_abView -> replaceEntry( replEntry );
}
}
// populateCategories();
}
void AddressbookWindow::editPersonal()
{
Opie::OPimContact entry;
// Switch to personal view if not selected
// but take care of the menu, too
if ( ! actionPersonal->isOn() ){
- Opie::Core::owarn << "*** ++++" << oendl;
+ 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()
{
- Opie::Core::owarn << "slotPersonalView()" << oendl;
+ owarn << "slotPersonalView()" << oendl;
if (!actionPersonal->isOn()) {
// we just turned it off
- Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
+ 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;
}
- Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
+ 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 );
}
void AddressbookWindow::listIsEmpty( bool empty )
{
if ( !empty ) {
deleteButton->setEnabled( TRUE );
}
}
void AddressbookWindow::reload()
{
syncing = FALSE;
m_abView->clear();
@@ -866,125 +866,125 @@ bool AddressbookWindow::save()
tr("Unable to save information.\n"
"Free up some space\n"
"and try again.\n"
"\nQuit anyway?"),
QMessageBox::Yes|QMessageBox::Escape,
QMessageBox::No|QMessageBox::Default )
!= QMessageBox::No )
return TRUE;
else
return FALSE;
}
return TRUE;
}
#ifdef __DEBUG_RELEASE
void AddressbookWindow::slotSave()
{
save();
}
#endif
void AddressbookWindow::slotNotFound()
{
- Opie::Core::owarn << "Got not found signal!" << oendl;
+ 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()
{
- Opie::Core::owarn << "Got wrap signal!" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+ 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 );
}
else
// Checkmark Category Menu Item Selected
for ( unsigned int i = 3; i < catMenu->count(); i++ )
catMenu->setItemChecked( i, c == (int)i );
// Now switch to the selected category
for ( unsigned int i = 1; i < catMenu->count(); i++ ) {
if (catMenu->isItemChecked( i )) {
if ( i == 1 ){ // default List view
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";
- Opie::Core::owarn << "Unfiled selected!" << oendl;
+ 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 )
{
- Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
+ 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);
m_cardViewButton->setOn(true);
break;
}
for ( unsigned int i = 1; i < 3; i++ ){
if ( catMenu )
catMenu->setItemChecked( i, menu == (int)i );
}
// Tell the view about the selected view
m_abView -> setShowToView ( (AbView::Views) view );
active_view = view;
}
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 094dbda..22f7291 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -22,88 +22,88 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
}
// Reset Widget Flags: This was not changeable by designer :(
setWFlags ( WStyle_ContextHelp );
// Set Pics to Buttons and Tabs
m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
// 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()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
+ 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()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
+ 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()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
+ owarn << "void ConfigDlg::slotItemAdd()" << oendl;
int i = allFieldListBox->currentItem();
if ( i > 0 ) {
QString item = allFieldListBox->currentText();
- Opie::Core::owarn << "Adding " << item << oendl;
+ owarn << "Adding " << item << oendl;
fieldListBox->insertItem( item );
}
}
void ConfigDlg::slotItemRemove()
{
- Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
+ 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() );
m_useWildCard->setChecked( m_config.useWildCards() );
m_useQtMail->setChecked( m_config.useQtMail() );
m_useOpieMail->setChecked( m_config.useOpieMail() );
m_useCaseSensitive->setChecked( m_config.beCaseSensitive() );
switch( m_config.fontSize() ){
case 0:
m_smallFont->setChecked( true );
m_normalFont->setChecked( false );
m_largeFont->setChecked( false );
break;
case 1:
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index e496387..72c8bd3 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -57,49 +57,49 @@ ContactEditor::ContactEditor( const Opie::OPimContact &entry,
QWidget *parent,
const char *name,
WFlags )
: QDialog( parent, name, TRUE, WStyle_ContextHelp ),
defaultEmailChooserPosition( -1 ),
m_personalView ( false ),
cmbDefaultEmail( 0 ),
initializing ( false )
{
initializing = true;
init();
setEntry( entry );
// cmbDefaultEmail = 0;
// defaultEmailChooserPosition = -1;
initializing = false;
}
ContactEditor::~ContactEditor() {
}
void ContactEditor::init() {
- Opie::Core::owarn << "init() START" << oendl;
+ 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 );
slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false );
trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false );
// Ok, we have to remove elements from the list of dynamic entries
// which are now stored in special (not dynamic) widgets..
// Otherwise we will get problems with field assignments! (se)
slDynamicEntries.remove("Anniversary");
slDynamicEntries.remove("Birthday");
slDynamicEntries.remove("Gender");
// The same with translated fields.. But I will
// use the translation map to avoid mismatches..
@@ -666,243 +666,243 @@ void ContactEditor::init() {
this, SLOT(slotCityChange(const QString&)) );
connect( txtState, SIGNAL(textChanged(const QString&)),
this, SLOT(slotStateChange(const QString&)) );
connect( txtZip, SIGNAL(textChanged(const QString&)),
this, SLOT(slotZipChange(const QString&)) );
connect( cmbCountry, SIGNAL(textChanged(const QString&)),
this, SLOT(slotCountryChange(const QString&)) );
connect( cmbCountry, SIGNAL(activated(const QString&)),
this, SLOT(slotCountryChange(const QString&)) );
connect( cmbChooserField1, SIGNAL(activated(int)),
this, SLOT(slotCmbChooser1Change(int)) );
connect( cmbChooserField2, SIGNAL(activated(int)),
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 );
- Opie::Core::owarn << "init() END" << oendl;
+ owarn << "init() END" << oendl;
}
void ContactEditor::defaultEmailChanged(int i){
- Opie::Core::odebug << "defaultEmailChanged" << oendl;
+ odebug << "defaultEmailChanged" << oendl;
// was sollte das ? (se)
// int index = cmbChooserField1->currentItem();
// slChooserValues[index] = cmbDefaultEmail->text(i);
defaultEmail = cmbDefaultEmail->text(i);
- Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
+ 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++){
- Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+ odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
<< "< defaultEmail >" << defaultEmail << "<" << oendl;
if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
cmbDefaultEmail->setCurrentItem( i );
- Opie::Core::odebug << "set" << oendl;
+ 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];
- Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+ 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"){
- Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+ 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 );
delete cmbo;
}
cmbo = new QComboBox( inputStack );
cmbo -> insertStringList( emails );
inputStack -> addWidget( cmbo, Combo );
inputStack -> raiseWidget( Combo );
defaultEmailChooserPosition = widgetPos;
cmbDefaultEmail = cmbo;
connect( cmbo,SIGNAL( activated(int) ),
SLOT( defaultEmailChanged(int) ) );
// Set current default email
populateDefaultEmailCmb();
} else {
// Something else was selected: Hide combo..
- Opie::Core::owarn << " Hiding default-email combo" << oendl;
+ 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 )
{
- Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
+ 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:
cmbChooserField1 -> setCurrentItem( 0 );
slotCmbChooser1Change( 0 );
break;
case 2:
cmbChooserField2 -> setCurrentItem( 0 );
slotCmbChooser2Change( 0 );
break;
case 3:
cmbChooserField3 -> setCurrentItem( 0 );
slotCmbChooser3Change( 0 );
break;
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
- Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+ odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
<< textChanged << "< index=" << index << ", widgetPos=" << widgetPos
<< " )" << oendl;
if ( type == "Default Email"){
- Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
+ owarn << "??? Wozu??: " << textChanged << oendl;
defaultEmail = textChanged;
populateDefaultEmailCmb();
}else if (type == "Emails"){
- Opie::Core::odebug << "emails" << oendl;
+ odebug << "emails" << oendl;
QString de;
emails = QStringList::split (",", textChanged );
populateDefaultEmailCmb();
}
slChooserValues[index] = textChanged;
}
void ContactEditor::slotChooser1Change( const QString &textChanged ) {
- Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
+ owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
}
void ContactEditor::slotChooser2Change( const QString &textChanged ) {
- Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
+ owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
}
void ContactEditor::slotChooser3Change( const QString &textChanged ) {
- Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
+ owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
}
void ContactEditor::slotChooser4Change( const QString &textChanged ) {
- Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
+ 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;
}
}
void ContactEditor::slotAddress2Change( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[1] = textChanged;
} else {
slHomeAddress[1] = textChanged;
}
}
void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
@@ -930,151 +930,151 @@ void ContactEditor::slotStateChange( const QString &textChanged ) {
slHomeAddress[4] = textChanged;
}
}
void ContactEditor::slotZipChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[5] = textChanged;
} else {
slHomeAddress[5] = textChanged;
}
}
void ContactEditor::slotCountryChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[6] = textChanged;
} else {
slHomeAddress[6] = textChanged;
}
}
void ContactEditor::slotCmbChooser1Change( int index ) {
- Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
+ owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
txtChooserField1->setText( slChooserValues[index] );
txtChooserField1->setFocus();
}
}
void ContactEditor::slotCmbChooser2Change( int index ) {
- Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
+ owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
txtChooserField2->setText( slChooserValues[index] );
txtChooserField2->setFocus();
}
}
void ContactEditor::slotCmbChooser3Change( int index ) {
- Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
+ owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
txtChooserField3->setText( slChooserValues[index] );
txtChooserField3->setFocus();
}
}
void ContactEditor::slotCmbChooser4Change( int index ) {
- Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
+ owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
txtChooserField4->setText( slChooserValues[index] );
txtChooserField4->setFocus();
}
}
void ContactEditor::slotAddressTypeChange( int index ) {
if ( !initializing )
contactfields.setFieldOrder( 4, index );
if ( index == 0 ) {
txtAddress->setText( slBusinessAddress[0] );
//txtAddress2->setText( (*slBusinessAddress)[1] );
//txtPOBox->setText( (*slBusinessAddress)[2] );
txtCity->setText( slBusinessAddress[3] );
txtState->setText( slBusinessAddress[4] );
txtZip->setText( slBusinessAddress[5] );
QLineEdit *txtTmp = cmbCountry->lineEdit();
txtTmp->setText( slBusinessAddress[6] );
} else {
txtAddress->setText( slHomeAddress[0] );
//txtAddress2->setText( (*slHomeAddress)[1] );
//txtPOBox->setText( (*slHomeAddress)[2] );
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 ) {
- Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
+ 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 ){
- Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
+ 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();
reject();
} else {
saveEntry();
cleanupFields();
QDialog::accept();
}
}
void ContactEditor::slotNote() {
if ( ! QPEApplication::execDialog( dlgNote ) ) {
@@ -1114,99 +1114,99 @@ bool ContactEditor::isEmpty() {
// More strict than the original qtopia, needs name or fileas to save
QString t = txtFullName->text();
if ( !t.isEmpty() && containsAlphaNum( t ) )
return false;
t = cmbFileAs->currentText();
if ( !t.isEmpty() && containsAlphaNum( t ) )
return false;
return true;
}
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;
- Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
+ owarn << "Fullname: " << simplifiedName << oendl;
commapos = simplifiedName.find( ',', 0, TRUE);
if ( commapos >= 0 ) {
- Opie::Core::owarn << " Commapos: " << commapos << oendl;
+ 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;
- Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
+ 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(" ");
} else {
// No comma separator used: We use the first word as firstname, the
// last as second/lastname and everything in the middle as middlename
QStringList allNames = QStringList::split(" ", simplifiedName);
QStringList::Iterator it = allNames.begin();
strFirstName = *it++;
QStringList allSecondNames;
for ( ; it != --allNames.end(); ++it )
allSecondNames.append( *it );
strMiddleName = allSecondNames.join(" ");
strLastName = *(--allNames.end());
}
if ( strFirstName == strLastName )
strFirstName = "";
- Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
- Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
- Opie::Core::owarn << "strLastName: " << strLastName << oendl;
- Opie::Core::owarn << "strTitle: " << strTitle << oendl;
+ owarn << "strFirstName: " << strFirstName << oendl;
+ owarn << "strMiddletName: " << strMiddleName << oendl;
+ owarn << "strLastName: " << strLastName << oendl;
+ 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:
return strFirstName + " " + strMiddleName + " " + strLastName ;
case NAME_F:
return strFirstName;
case NAME_M:
return strMiddleName;
case NAME_L:
return strLastName;
case NAME_S:
@@ -1247,49 +1247,49 @@ void ContactEditor::cleanupFields() {
txtAddress->setText("");
txtCity->setText("");
txtState->setText("");
txtZip->setText("");
QLineEdit *txtTmp = cmbCountry->lineEdit();
txtTmp->setText("");
txtTmp = cmbFileAs->lineEdit();
txtTmp->setText("");
}
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];
- Opie::Core::odebug << "default email=" << defaultEmail << oendl;
+ 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() ){
// Lastnames with multiple words need to be protected by a comma !
if ( ent.lastName().contains( ' ', TRUE ) )
txtFullName->setText( ent.lastName() + ", " + ent.firstName() + " " + ent.middleName() );
else
txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() );
}
cmbFileAs->setEditText( ent.fileAs() );
// if (hasTitle)
txtJobTitle->setText( ent.jobTitle() );
@@ -1307,73 +1307,73 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
// if (hasCity) {
slHomeAddress[3] = ent.homeCity();
slBusinessAddress[3] = ent.businessCity();
//}
//if (hasState) {
slHomeAddress[4] = ent.homeState();
slBusinessAddress[4] = ent.businessState();
//}
//if (hasZip) {
slHomeAddress[5] = ent.homeZip();
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) {
- Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
+ 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" ){
- Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
+ 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" ) )
*itV = ent.businessPhone();
/*
if ( *it == "Business 2 Phone" )
*itV = ent.business2Phone();
*/
if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) )
*itV = ent.businessFax();
if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) )
*itV = ent.businessMobile();
/*
if ( *it == "Company Phone" )
@@ -1564,50 +1564,50 @@ void ContactEditor::saveEntry() {
if ( *it == "Children" )
ent.setChildren( (*itLE)->text() );
}
QStringList::ConstIterator itV;
for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) )
ent.setBusinessPhone( *itV );
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() ){
- Opie::Core::owarn << "Default email was not set by user!" << oendl;
- Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
+ owarn << "Default email was not set by user!" << oendl;
+ 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" )
ent.setHomeFax( *itV );
if ( *it == "Home Mobile" )
ent.setHomeMobile( *itV );
if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
ent.setBusinessPager( *itV );
if ( *it == "Home Web Page" )
ent.setHomeWebpage( *itV );
if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
@@ -1717,35 +1717,35 @@ void ContactEditor::setPersonalView( bool personal )
labCat->show();
}
}
void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
{
QDate date;
date.setYMD( year, month, day );
QString dateString = TimeString::numberDateString( date );
anniversaryButton->setText( dateString );
ent.setAnniversary ( date );
}
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()
{
- Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
+ owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
ent.setBirthday( QDate() );
updateDatePicker();
}
void ContactEditor::slotRemoveAnniversary()
{
- Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
+ owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
ent.setAnniversary( QDate() );
updateDatePicker();
}
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index df3d6ac..8a9c85b 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -218,28 +218,28 @@ LetterPicker::LetterPicker( QWidget *parent, const char *name )
LetterPicker::~LetterPicker()
{
}
QSizePolicy LetterPicker::sizePolicy () const
{
return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Maximum);
}
void LetterPicker::clear()
{
lblABC->clearLetter();
lblDEF->clearLetter();
lblGHI->clearLetter();
lblJKL->clearLetter();
lblMNO->clearLetter();
lblPQR->clearLetter();
lblSTU->clearLetter();
lblVWX->clearLetter();
lblYZ->clearLetter();
}
void LetterPicker::newLetter( char letter )
{
- Opie::Core::owarn << "LetterClicked" << oendl;
+ owarn << "LetterClicked" << oendl;
emit letterClicked( letter );
}