From 1943a35fbcab844d469e8129f78bf7ebe504aa42 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Wed, 30 Dec 2015 23:16:04 -0500 Subject: historyform: Disable editing --- src/gui/historyform.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/historyform.ui b/src/gui/historyform.ui index 859c496..24544b4 100644 --- a/src/gui/historyform.ui +++ b/src/gui/historyform.ui @@ -25,6 +25,9 @@ QAbstractItemView::SelectRows + + QAbstractItemView::NoEditTriggers + true -- cgit v1.2.3 From f3926963ea687c6dbac3d6e3fdb832f81bddf903 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Wed, 30 Dec 2015 23:16:47 -0500 Subject: historyform: Show call details of current item The signal QAbstractItemView::activated() is emitted only when double-clicking or pressing the Enter key on a current item. Listen to signal QItemSelectionModel::currentChanged(), which is emitted when the current item is changed with a single click or the arrow keys. --- src/gui/historyform.cpp | 15 ++++++++------- src/gui/historyform.h | 3 ++- src/gui/historyform.ui | 17 ----------------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/gui/historyform.cpp b/src/gui/historyform.cpp index 15b882a..319d6f1 100644 --- a/src/gui/historyform.cpp +++ b/src/gui/historyform.cpp @@ -84,6 +84,8 @@ void HistoryForm::init() #else historyListView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents); #endif + + connect(historyListView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(showCallDetails(QModelIndex))); inCheckBox->setChecked(true); outCheckBox->setChecked(true); @@ -236,9 +238,7 @@ void HistoryForm::loadHistory() // Sort entries using currently selected sort column and order. historyListView->sortByColumn(historyListView->horizontalHeader()->sortIndicatorSection(), historyListView->horizontalHeader()->sortIndicatorOrder()); // Make the first entry the selected entry. - historyListView->selectRow(0); - - // showCallDetails(first); + if (numberOfCalls) historyListView->selectRow(0); } // Update history when triggered by a call back function on the user @@ -279,13 +279,14 @@ void HistoryForm::closeEvent( QCloseEvent *e ) QDialog::closeEvent(e); } -void HistoryForm::showCallDetails(QModelIndex index) +void HistoryForm::showCallDetails(const QModelIndex &index) { - QString s; + cdrTextEdit->clear(); + + if (!index.isValid()) return; int x = m_model->data(index, Qt::UserRole).toInt(); const t_call_record& cr = m_history[x]; - cdrTextEdit->clear(); t_user *user_config = phone->ref_user_profile(cr.user_profile); // If the user profile is not active, then use the @@ -294,7 +295,7 @@ void HistoryForm::showCallDetails(QModelIndex index) user_config = phone->ref_users().front(); } - s = ""; + QString s = "
"; // Left column: header names s += "
"; diff --git a/src/gui/historyform.h b/src/gui/historyform.h index 76ea161..dd6b6b2 100644 --- a/src/gui/historyform.h +++ b/src/gui/historyform.h @@ -20,7 +20,6 @@ public slots: virtual void update(); virtual void show(); virtual void closeEvent( QCloseEvent * e ); - virtual void showCallDetails( QModelIndex item ); virtual void popupMenu( QPoint pos ); virtual void call( QModelIndex index ); virtual void call( void ); @@ -45,6 +44,8 @@ private: void init(); void destroy(); +private slots: + void showCallDetails(const QModelIndex &); }; diff --git a/src/gui/historyform.ui b/src/gui/historyform.ui index 24544b4..86dbc3f 100644 --- a/src/gui/historyform.ui +++ b/src/gui/historyform.ui @@ -445,26 +445,9 @@ - - historyListView - activated(QModelIndex) - HistoryForm - showCallDetails(QModelIndex) - - - 743 - 238 - - - 658 - 300 - - - call(QModelIndex) popupMenu(QPoint) - showCallDetails(QModelIndex) -- cgit v1.2.3