-rw-r--r-- | kabc/addresseedialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index cb6c12f..eb9bfc9 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -102,97 +102,97 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | |||
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 | ||
122 | AddresseeDialog::~AddresseeDialog() | 122 | AddresseeDialog::~AddresseeDialog() |
123 | { | 123 | { |
124 | } | 124 | } |
125 | 125 | ||
126 | void AddresseeDialog::loadAddressBook() | 126 | void 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 | new AddresseeItem( mAddresseeList, (*it) ); | 133 | new AddresseeItem( mAddresseeList, (*it) ); |
134 | } | 134 | } |
135 | return; | 135 | return; |
136 | } | 136 | } |
137 | //mAddresseeEdit->completionObject()->clear(); | 137 | //mAddresseeEdit->completionObject()->clear(); |
138 | QRegExp re; | 138 | QRegExp re; |
139 | re.setWildcard(true); // most people understand these better. | 139 | re.setWildcard(true); // most people understand these better. |
140 | re.setCaseSensitive(false); | 140 | re.setCaseSensitive(false); |
141 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); | 141 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); |
142 | 142 | ||
143 | AddressBook::Iterator it; | 143 | AddressBook::Iterator it; |
144 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 144 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
145 | QString name = (*it).familyName()+", "+ (*it).givenName(); | 145 | QString name = (*it).familyName()+", "+ (*it).givenName(); |
146 | if ( name.length() == 2 ) | 146 | if ( name.length() == 2 ) |
147 | name = (*it).realName(); | 147 | name = (*it).realName(); |
148 | name += (*it).preferredEmail(); | 148 | name += (*it).preferredEmail(); |
149 | #if QT_VERSION >= 300 | 149 | #if QT_VERSION >= 300 |
150 | if (re.search(name)) != -1) | 150 | if (re.search(name) != -1) |
151 | #else | 151 | #else |
152 | if (re.match(name) != -1) | 152 | if (re.match(name) != -1) |
153 | #endif | 153 | #endif |
154 | AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); | 154 | AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); |
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item ) | 158 | void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item ) |
159 | { | 159 | { |
160 | if ( str.isEmpty() ) return; | 160 | if ( str.isEmpty() ) return; |
161 | 161 | ||
162 | mItemDict.insert( str, item ); | 162 | mItemDict.insert( str, item ); |
163 | //mAddresseeEdit->completionObject()->addItem( str ); | 163 | //mAddresseeEdit->completionObject()->addItem( str ); |
164 | } | 164 | } |
165 | 165 | ||
166 | void AddresseeDialog::selectItem( const QString &str ) | 166 | void AddresseeDialog::selectItem( const QString &str ) |
167 | { | 167 | { |
168 | if ( str.isEmpty() ) return; | 168 | if ( str.isEmpty() ) return; |
169 | 169 | ||
170 | QListViewItem *item = mItemDict.find( str ); | 170 | QListViewItem *item = mItemDict.find( str ); |
171 | if ( item ) { | 171 | if ( item ) { |
172 | mAddresseeList->blockSignals( true ); | 172 | mAddresseeList->blockSignals( true ); |
173 | mAddresseeList->setSelected( item, true ); | 173 | mAddresseeList->setSelected( item, true ); |
174 | mAddresseeList->ensureItemVisible( item ); | 174 | mAddresseeList->ensureItemVisible( item ); |
175 | mAddresseeList->blockSignals( false ); | 175 | mAddresseeList->blockSignals( false ); |
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | void AddresseeDialog::updateEdit( QListViewItem *item ) | 179 | void AddresseeDialog::updateEdit( QListViewItem *item ) |
180 | { | 180 | { |
181 | mAddresseeEdit->setText( item->text( 0 ) ); | 181 | mAddresseeEdit->setText( item->text( 0 ) ); |
182 | mAddresseeEdit->setSelection( 0, item->text( 0 ).length() ); | 182 | mAddresseeEdit->setSelection( 0, item->text( 0 ).length() ); |
183 | } | 183 | } |
184 | 184 | ||
185 | void AddresseeDialog::selectNextItem( QListViewItem *item ) | 185 | void AddresseeDialog::selectNextItem( QListViewItem *item ) |
186 | { | 186 | { |
187 | addSelected( item ); | 187 | addSelected( item ); |
188 | QListViewItem *next = item->nextSibling(); | 188 | QListViewItem *next = item->nextSibling(); |
189 | if ( next ) { | 189 | if ( next ) { |
190 | next->setSelected( true ); | 190 | next->setSelected( true ); |
191 | item->setSelected( false ); | 191 | item->setSelected( false ); |
192 | mAddresseeList->setCurrentItem( next ); | 192 | mAddresseeList->setCurrentItem( next ); |
193 | } | 193 | } |
194 | } | 194 | } |
195 | void AddresseeDialog::addSelected( QListViewItem *item ) | 195 | void AddresseeDialog::addSelected( QListViewItem *item ) |
196 | { | 196 | { |
197 | AddresseeItem *addrItem = (AddresseeItem *)( item ); | 197 | AddresseeItem *addrItem = (AddresseeItem *)( item ); |
198 | if ( !addrItem ) return; | 198 | if ( !addrItem ) return; |