-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index e40eb9e..6f20e05 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -67,74 +67,80 @@ void KAddressBookTableView::scrollDOWN() | |||
67 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); | 67 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); |
68 | QApplication::postEvent( mListView, ev ); | 68 | QApplication::postEvent( mListView, ev ); |
69 | } | 69 | } |
70 | void KAddressBookTableView::reconstructListView() | 70 | void KAddressBookTableView::reconstructListView() |
71 | { | 71 | { |
72 | if (mListView) | 72 | if (mListView) |
73 | { | 73 | { |
74 | disconnect(mListView, SIGNAL(selectionChanged()), | 74 | disconnect(mListView, SIGNAL(selectionChanged()), |
75 | this, SLOT(addresseeSelected())); | 75 | this, SLOT(addresseeSelected())); |
76 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), | 76 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), |
77 | this, SLOT(addresseeExecuted(QListViewItem*))); | 77 | this, SLOT(addresseeExecuted(QListViewItem*))); |
78 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 78 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
79 | this, SLOT(addresseeExecuted(QListViewItem*))); | 79 | this, SLOT(addresseeExecuted(QListViewItem*))); |
80 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, | 80 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, |
81 | SIGNAL(startDrag())); | 81 | SIGNAL(startDrag())); |
82 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 82 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
83 | this, SLOT(addresseeExecuted(QListViewItem*))); | 83 | this, SLOT(addresseeExecuted(QListViewItem*))); |
84 | 84 | ||
85 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 85 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
86 | SIGNAL(dropped(QDropEvent*))); | 86 | SIGNAL(dropped(QDropEvent*))); |
87 | delete mListView; | 87 | delete mListView; |
88 | } | 88 | } |
89 | 89 | ||
90 | mListView = new ContactListView( this, addressBook(), viewWidget() ); | 90 | mListView = new ContactListView( this, addressBook(), viewWidget() ); |
91 | |||
92 | //US set singleClick manually, because it is no global configparameter in embedded space | ||
93 | mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick); | ||
91 | 94 | ||
92 | // Add the columns | 95 | // Add the columns |
93 | KABC::Field::List fieldList = fields(); | 96 | KABC::Field::List fieldList = fields(); |
94 | KABC::Field::List::ConstIterator it; | 97 | KABC::Field::List::ConstIterator it; |
95 | 98 | ||
96 | int c = 0; | 99 | int c = 0; |
97 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { | 100 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { |
98 | mListView->addColumn( (*it)->label() ); | 101 | mListView->addColumn( (*it)->label() ); |
99 | mListView->setColumnWidthMode(c++, QListView::Manual); | 102 | mListView->setColumnWidthMode(c++, QListView::Manual); |
100 | //US | 103 | //US |
101 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); | 104 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); |
102 | } | 105 | } |
103 | 106 | ||
104 | connect(mListView, SIGNAL(selectionChanged()), | 107 | connect(mListView, SIGNAL(selectionChanged()), |
105 | this, SLOT(addresseeSelected())); | 108 | this, SLOT(addresseeSelected())); |
106 | connect(mListView, SIGNAL(startAddresseeDrag()), this, | 109 | connect(mListView, SIGNAL(startAddresseeDrag()), this, |
107 | SIGNAL(startDrag())); | 110 | SIGNAL(startDrag())); |
108 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 111 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
109 | SIGNAL(dropped(QDropEvent*))); | 112 | SIGNAL(dropped(QDropEvent*))); |
110 | 113 | ||
111 | if (KABPrefs::instance()->mHonorSingleClick) | 114 | if (KABPrefs::instance()->mHonorSingleClick) { |
115 | // qDebug("KAddressBookTableView::reconstructListView single"); | ||
112 | connect(mListView, SIGNAL(executed(QListViewItem*)), | 116 | connect(mListView, SIGNAL(executed(QListViewItem*)), |
113 | this, SLOT(addresseeExecuted(QListViewItem*))); | 117 | this, SLOT(addresseeExecuted(QListViewItem*))); |
114 | else | 118 | } else { |
119 | // qDebug("KAddressBookTableView::reconstructListView double"); | ||
115 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 120 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
116 | this, SLOT(addresseeExecuted(QListViewItem*))); | 121 | this, SLOT(addresseeExecuted(QListViewItem*))); |
122 | } | ||
117 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 123 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
118 | this, SLOT(addresseeExecuted(QListViewItem*))); | 124 | this, SLOT(addresseeExecuted(QListViewItem*))); |
119 | connect(mListView, SIGNAL(signalDelete()), | 125 | connect(mListView, SIGNAL(signalDelete()), |
120 | this, SLOT(addresseeDeleted())); | 126 | this, SLOT(addresseeDeleted())); |
121 | 127 | ||
122 | //US performceimprovement. Refresh is done from the outside | 128 | //US performceimprovement. Refresh is done from the outside |
123 | //US refresh(); | 129 | //US refresh(); |
124 | 130 | ||
125 | mListView->setSorting( 0, true ); | 131 | mListView->setSorting( 0, true ); |
126 | mainLayout->addWidget( mListView ); | 132 | mainLayout->addWidget( mListView ); |
127 | mainLayout->activate(); | 133 | mainLayout->activate(); |
128 | mListView->show(); | 134 | mListView->show(); |
129 | } | 135 | } |
130 | 136 | ||
131 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | 137 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) |
132 | { | 138 | { |
133 | mListView->clear(); | 139 | mListView->clear(); |
134 | if ( s.isEmpty() || s == "*" ) { | 140 | if ( s.isEmpty() || s == "*" ) { |
135 | refresh(); | 141 | refresh(); |
136 | return; | 142 | return; |
137 | } | 143 | } |
138 | QString pattern = s.lower()+"*"; | 144 | QString pattern = s.lower()+"*"; |
139 | QRegExp re; | 145 | QRegExp re; |
140 | re.setWildcard(true); // most people understand these better. | 146 | re.setWildcard(true); // most people understand these better. |