summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-26 00:05:19 (UTC)
committer zautrix <zautrix>2004-10-26 00:05:19 (UTC)
commit283cdf0b976a66c8e29ac327385472844d92f581 (patch) (unidiff)
treeda0b3e6fe816db76fa2015f4df0748e32679db43
parent8cc5f6491c0f0f1ad6568b8c6221ca8cdeac3207 (diff)
downloadkdepimpi-283cdf0b976a66c8e29ac327385472844d92f581.zip
kdepimpi-283cdf0b976a66c8e29ac327385472844d92f581.tar.gz
kdepimpi-283cdf0b976a66c8e29ac327385472844d92f581.tar.bz2
removed last-syncAddressee- from AddresseeDialog list
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addresseedialog.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index eb9bfc9..ae67968 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -101,76 +101,80 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
101 SLOT( removeSelected() ) ); 101 SLOT( removeSelected() ) );
102 102
103 QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 103 QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup );
104 connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) ); 104 connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
105 105
106 connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ), 106 connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
107 SLOT( addSelected( QListViewItem * ) ) ); 107 SLOT( addSelected( QListViewItem * ) ) );
108 connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ), 108 connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
109 SLOT( selectNextItem( QListViewItem * ) ) ); 109 SLOT( selectNextItem( QListViewItem * ) ) );
110 110
111 } 111 }
112 112
113 mAddressBook = StdAddressBook::self( true ); 113 mAddressBook = StdAddressBook::self( true );
114 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ), 114 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
115 SLOT( addressBookChanged() ) ); 115 SLOT( addressBookChanged() ) );
116 connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), 116 connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
117 SLOT( addressBookChanged() ) ); 117 SLOT( addressBookChanged() ) );
118 118
119 loadAddressBook(); 119 loadAddressBook();
120} 120}
121 121
122AddresseeDialog::~AddresseeDialog() 122AddresseeDialog::~AddresseeDialog()
123{ 123{
124} 124}
125 125
126void AddresseeDialog::loadAddressBook() 126void AddresseeDialog::loadAddressBook()
127{ 127{
128 mAddresseeList->clear(); 128 mAddresseeList->clear();
129 mItemDict.clear(); 129 mItemDict.clear();
130 if ( mAddresseeEdit->text().isEmpty() ) { 130 if ( mAddresseeEdit->text().isEmpty() ) {
131 AddressBook::Iterator it; 131 AddressBook::Iterator it;
132 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 132 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
133 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
134 continue;
133 new AddresseeItem( mAddresseeList, (*it) ); 135 new AddresseeItem( mAddresseeList, (*it) );
134 } 136 }
135 return; 137 return;
136 } 138 }
137 //mAddresseeEdit->completionObject()->clear(); 139 //mAddresseeEdit->completionObject()->clear();
138 QRegExp re; 140 QRegExp re;
139 re.setWildcard(true); // most people understand these better. 141 re.setWildcard(true); // most people understand these better.
140 re.setCaseSensitive(false); 142 re.setCaseSensitive(false);
141 re.setPattern( "*"+ mAddresseeEdit->text() + "*"); 143 re.setPattern( "*"+ mAddresseeEdit->text() + "*");
142 144
143 AddressBook::Iterator it; 145 AddressBook::Iterator it;
144 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 146 for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
147 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
148 continue;
145 QString name = (*it).familyName()+", "+ (*it).givenName(); 149 QString name = (*it).familyName()+", "+ (*it).givenName();
146 if ( name.length() == 2 ) 150 if ( name.length() == 2 )
147 name = (*it).realName(); 151 name = (*it).realName();
148 name += (*it).preferredEmail(); 152 name += (*it).preferredEmail();
149#if QT_VERSION >= 300 153#if QT_VERSION >= 300
150 if (re.search(name) != -1) 154 if (re.search(name) != -1)
151#else 155#else
152 if (re.match(name) != -1) 156 if (re.match(name) != -1)
153#endif 157#endif
154 AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); 158 AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
155 } 159 }
156} 160}
157 161
158void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item ) 162void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
159{ 163{
160 if ( str.isEmpty() ) return; 164 if ( str.isEmpty() ) return;
161 165
162 mItemDict.insert( str, item ); 166 mItemDict.insert( str, item );
163 //mAddresseeEdit->completionObject()->addItem( str ); 167 //mAddresseeEdit->completionObject()->addItem( str );
164} 168}
165 169
166void AddresseeDialog::selectItem( const QString &str ) 170void AddresseeDialog::selectItem( const QString &str )
167{ 171{
168 if ( str.isEmpty() ) return; 172 if ( str.isEmpty() ) return;
169 173
170 QListViewItem *item = mItemDict.find( str ); 174 QListViewItem *item = mItemDict.find( str );
171 if ( item ) { 175 if ( item ) {
172 mAddresseeList->blockSignals( true ); 176 mAddresseeList->blockSignals( true );
173 mAddresseeList->setSelected( item, true ); 177 mAddresseeList->setSelected( item, true );
174 mAddresseeList->ensureItemVisible( item ); 178 mAddresseeList->ensureItemVisible( item );
175 mAddresseeList->blockSignals( false ); 179 mAddresseeList->blockSignals( false );
176 } 180 }