Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index beb953a..8229212 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -190,9 +190,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
190 | } | 190 | } |
191 | 191 | ||
192 | listContainer = new QWidget( this ); | 192 | listContainer = new QWidget( this ); |
193 | 193 | ||
194 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); | 194 | QVBoxLayout *vb = new QVBoxLayout( listContainer ); |
195 | 195 | ||
196 | abList = new AbTable( &orderedFields, listContainer, "table" ); | 196 | abList = new AbTable( &orderedFields, listContainer, "table" ); |
197 | vb->addWidget(abList); | 197 | vb->addWidget(abList); |
198 | abList->setHScrollBarMode( QScrollView::AlwaysOff ); | 198 | abList->setHScrollBarMode( QScrollView::AlwaysOff ); |
@@ -233,7 +233,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
233 | defaultFont = new QFont( abList->font() ); | 233 | defaultFont = new QFont( abList->font() ); |
234 | 234 | ||
235 | slotSetFont(startFontSize); | 235 | slotSetFont(startFontSize); |
236 | 236 | ||
237 | mbList->insertItem( tr("Font"), fontMenu); | 237 | mbList->insertItem( tr("Font"), fontMenu); |
238 | setCentralWidget(listContainer); | 238 | setCentralWidget(listContainer); |
239 | 239 | ||
@@ -247,7 +247,7 @@ void AddressbookWindow::slotSetFont( int size ) { | |||
247 | startFontSize = size; | 247 | startFontSize = size; |
248 | 248 | ||
249 | QFont *currentFont; | 249 | QFont *currentFont; |
250 | 250 | ||
251 | switch (size) { | 251 | switch (size) { |
252 | case 0: | 252 | case 0: |
253 | fontMenu->setItemChecked(0, true); | 253 | fontMenu->setItemChecked(0, true); |
@@ -471,7 +471,7 @@ static void parseName( const QString& name, QString *first, QString *middle, | |||
471 | *first = rest.left( space ); | 471 | *first = rest.left( space ); |
472 | *middle = rest.mid( space+1 ); | 472 | *middle = rest.mid( space+1 ); |
473 | } | 473 | } |
474 | 474 | ||
475 | } | 475 | } |
476 | 476 | ||
477 | 477 | ||
@@ -503,7 +503,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
503 | this, "editor" ); | 503 | this, "editor" ); |
504 | bAbEditFirstTime = FALSE; | 504 | bAbEditFirstTime = FALSE; |
505 | } else { | 505 | } else { |
506 | abEditor->setEntry( cnt ); | 506 | abEditor->setEntry( cnt ); |
507 | } | 507 | } |
508 | abView()->init( cnt ); | 508 | abView()->init( cnt ); |
509 | editEntry( NewEntry ); | 509 | editEntry( NewEntry ); |
@@ -794,7 +794,7 @@ void AddressbookWindow::initFields() | |||
794 | } | 794 | } |
795 | cfg.setGroup( "Font" ); | 795 | cfg.setGroup( "Font" ); |
796 | startFontSize = cfg.readNumEntry( "fontSize", 1 ); | 796 | startFontSize = cfg.readNumEntry( "fontSize", 1 ); |
797 | 797 | ||
798 | 798 | ||
799 | } else { | 799 | } else { |
800 | QString str; | 800 | QString str; |
@@ -859,14 +859,14 @@ void AddressbookWindow::slotFind() | |||
859 | #ifndef MAKE_FOR_SHARP_ROM | 859 | #ifndef MAKE_FOR_SHARP_ROM |
860 | if ( centralWidget() == abView() ) | 860 | if ( centralWidget() == abView() ) |
861 | showList(); | 861 | showList(); |
862 | 862 | ||
863 | FindDialog frmFind( "Contacts", this ); | 863 | FindDialog frmFind( "Contacts", this ); |
864 | QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int))); | 864 | QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int))); |
865 | QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); | 865 | QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); |
866 | QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); | 866 | QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); |
867 | 867 | ||
868 | frmFind.exec(); | 868 | frmFind.exec(); |
869 | 869 | ||
870 | if ( abList->numSelections() ) | 870 | if ( abList->numSelections() ) |
871 | abList->clearSelection(); | 871 | abList->clearSelection(); |
872 | 872 | ||
@@ -906,6 +906,7 @@ void AddressbookWindow::populateCategories() | |||
906 | int id, | 906 | int id, |
907 | rememberId; | 907 | rememberId; |
908 | id = 1; | 908 | id = 1; |
909 | rememberId = 0; | ||
909 | catMenu->insertItem( tr( "All" ), id++ ); | 910 | catMenu->insertItem( tr( "All" ), id++ ); |
910 | QStringList categories = abList->categories(); | 911 | QStringList categories = abList->categories(); |
911 | categories.append( tr( "Unfiled" ) ); | 912 | categories.append( tr( "Unfiled" ) ); |