-rw-r--r-- | kabc/addresseedialog.cpp | 6 |
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 | |||
@@ -69,140 +69,144 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | |||
69 | 69 | ||
70 | mAddresseeList = new KListView( topWidget ); | 70 | mAddresseeList = new KListView( topWidget ); |
71 | mAddresseeList->addColumn( i18n("Name") ); | 71 | mAddresseeList->addColumn( i18n("Name") ); |
72 | mAddresseeList->addColumn( i18n("Email") ); | 72 | mAddresseeList->addColumn( i18n("Email") ); |
73 | mAddresseeList->setAllColumnsShowFocus( true ); | 73 | mAddresseeList->setAllColumnsShowFocus( true ); |
74 | mAddresseeList->setFullWidth( true ); | 74 | mAddresseeList->setFullWidth( true ); |
75 | listLayout->addWidget( mAddresseeList ); | 75 | listLayout->addWidget( mAddresseeList ); |
76 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), | 76 | connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), |
77 | SLOT( slotOk() ) ); | 77 | SLOT( slotOk() ) ); |
78 | 78 | ||
79 | mAddresseeEdit = new QLineEdit( topWidget ); | 79 | mAddresseeEdit = new QLineEdit( topWidget ); |
80 | connect( mAddresseeEdit, SIGNAL( returnPressed() ), | 80 | connect( mAddresseeEdit, SIGNAL( returnPressed() ), |
81 | SLOT( loadAddressBook() ) ); | 81 | SLOT( loadAddressBook() ) ); |
82 | mAddresseeEdit->setFocus(); | 82 | mAddresseeEdit->setFocus(); |
83 | 83 | ||
84 | listLayout->addWidget( mAddresseeEdit ); | 84 | listLayout->addWidget( mAddresseeEdit ); |
85 | 85 | ||
86 | if ( mMultiple ) { | 86 | if ( mMultiple ) { |
87 | QBoxLayout *selectedLayout = new QVBoxLayout; | 87 | QBoxLayout *selectedLayout = new QVBoxLayout; |
88 | topLayout->addLayout( selectedLayout ); | 88 | topLayout->addLayout( selectedLayout ); |
89 | topLayout->setSpacing( spacingHint() ); | 89 | topLayout->setSpacing( spacingHint() ); |
90 | 90 | ||
91 | QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"), | 91 | QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"), |
92 | topWidget ); | 92 | topWidget ); |
93 | selectedLayout->addWidget( selectedGroup ); | 93 | selectedLayout->addWidget( selectedGroup ); |
94 | 94 | ||
95 | mSelectedList = new KListView( selectedGroup ); | 95 | mSelectedList = new KListView( selectedGroup ); |
96 | mSelectedList->addColumn( i18n("Name") ); | 96 | mSelectedList->addColumn( i18n("Name") ); |
97 | mSelectedList->addColumn( i18n("Email") ); | 97 | mSelectedList->addColumn( i18n("Email") ); |
98 | mSelectedList->setAllColumnsShowFocus( true ); | 98 | mSelectedList->setAllColumnsShowFocus( true ); |
99 | mSelectedList->setFullWidth( true ); | 99 | mSelectedList->setFullWidth( true ); |
100 | connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ), | 100 | connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ), |
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 | ||
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 | 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 | ||
158 | void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item ) | 162 | void 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 | ||
166 | void AddresseeDialog::selectItem( const QString &str ) | 170 | void 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 | } |
177 | } | 181 | } |
178 | 182 | ||
179 | void AddresseeDialog::updateEdit( QListViewItem *item ) | 183 | void AddresseeDialog::updateEdit( QListViewItem *item ) |
180 | { | 184 | { |
181 | mAddresseeEdit->setText( item->text( 0 ) ); | 185 | mAddresseeEdit->setText( item->text( 0 ) ); |
182 | mAddresseeEdit->setSelection( 0, item->text( 0 ).length() ); | 186 | mAddresseeEdit->setSelection( 0, item->text( 0 ).length() ); |
183 | } | 187 | } |
184 | 188 | ||
185 | void AddresseeDialog::selectNextItem( QListViewItem *item ) | 189 | void AddresseeDialog::selectNextItem( QListViewItem *item ) |
186 | { | 190 | { |
187 | addSelected( item ); | 191 | addSelected( item ); |
188 | QListViewItem *next = item->nextSibling(); | 192 | QListViewItem *next = item->nextSibling(); |
189 | if ( next ) { | 193 | if ( next ) { |
190 | next->setSelected( true ); | 194 | next->setSelected( true ); |
191 | item->setSelected( false ); | 195 | item->setSelected( false ); |
192 | mAddresseeList->setCurrentItem( next ); | 196 | mAddresseeList->setCurrentItem( next ); |
193 | } | 197 | } |
194 | } | 198 | } |
195 | void AddresseeDialog::addSelected( QListViewItem *item ) | 199 | void AddresseeDialog::addSelected( QListViewItem *item ) |
196 | { | 200 | { |
197 | AddresseeItem *addrItem = (AddresseeItem *)( item ); | 201 | AddresseeItem *addrItem = (AddresseeItem *)( item ); |
198 | if ( !addrItem ) return; | 202 | if ( !addrItem ) return; |
199 | 203 | ||
200 | Addressee a = addrItem->addressee(); | 204 | Addressee a = addrItem->addressee(); |
201 | 205 | ||
202 | QListViewItem *selectedItem = mSelectedDict.find( a.uid() ); | 206 | QListViewItem *selectedItem = mSelectedDict.find( a.uid() ); |
203 | if ( !selectedItem ) { | 207 | if ( !selectedItem ) { |
204 | selectedItem = new AddresseeItem( mSelectedList, a ); | 208 | selectedItem = new AddresseeItem( mSelectedList, a ); |
205 | mSelectedDict.insert( a.uid(), selectedItem ); | 209 | mSelectedDict.insert( a.uid(), selectedItem ); |
206 | } | 210 | } |
207 | 211 | ||
208 | } | 212 | } |