diff --git a/kdevplatform/shell/sessionchooserdialog.cpp b/kdevplatform/shell/sessionchooserdialog.cpp --- a/kdevplatform/shell/sessionchooserdialog.cpp +++ b/kdevplatform/shell/sessionchooserdialog.cpp @@ -196,24 +196,26 @@ if(m_deleteCandidateRow == -1) return; - QModelIndex index = m_model->index(m_deleteCandidateRow, 0); - const QString uuid = m_model->data(index, Qt::DisplayRole).toString(); + QModelIndex uuidIndex = m_model->index(m_deleteCandidateRow, 0); + QModelIndex sessionNameIndex = m_model->index(m_deleteCandidateRow, 3); + const QString uuid = m_model->data(uuidIndex, Qt::DisplayRole).toString(); + const QString sessionName = m_model->data(sessionNameIndex, Qt::DisplayRole).toString(); TryLockSessionResult result = SessionController::tryLockSession( uuid ); if( !result.lock ) { const QString errCaption = i18nc("@title", "Cannot Delete Session"); QString errText = i18nc("@info", "

Cannot delete a locked session."); if( result.runInfo.holderPid != -1 ) { - errText += i18nc("@info", "

The session is locked by %1 on %2 (PID %3).", - result.runInfo.holderApp, result.runInfo.holderHostname, result.runInfo.holderPid); + errText += i18nc("@info", "

The session %1 is locked by %2 on %3 (PID %4).", + sessionName, result.runInfo.holderApp, result.runInfo.holderHostname, result.runInfo.holderPid); } KMessageBox::error( this, errText, errCaption ); return; } - const QString text = i18nc("@info", "The session and all contained settings will be deleted. The projects will stay unaffected. Do you really want to continue?"); + const QString text = i18nc("@info", "The session %1 and all contained settings will be deleted. The projects will stay unaffected. Do you really want to continue?", sessionName); const QString caption = i18nc("@title", "Delete Session"); const KGuiItem deleteItem = KStandardGuiItem::del(); const KGuiItem cancelItem = KStandardGuiItem::cancel(); diff --git a/kdevplatform/shell/sessioncontroller.cpp b/kdevplatform/shell/sessioncontroller.cpp --- a/kdevplatform/shell/sessioncontroller.cpp +++ b/kdevplatform/shell/sessioncontroller.cpp @@ -599,10 +599,11 @@ layout.addWidget(heading); } - model->setColumnCount(3); + model->setColumnCount(4); model->setHeaderData(0, Qt::Horizontal,i18n("Identity")); - model->setHeaderData(1, Qt::Horizontal, i18n("Contents")); + model->setHeaderData(1, Qt::Horizontal,i18n("Contents")); model->setHeaderData(2, Qt::Horizontal,i18n("State")); + model->setHeaderData(3, Qt::Horizontal,i18n("Name")); view->setModel(proxy); view->setModelColumn(1); @@ -628,10 +629,11 @@ if(onlyRunning && !running) continue; - + model->setItem(row, 0, new QStandardItem(si.uuid.toString())); model->setItem(row, 1, new QStandardItem(si.description)); model->setItem(row, 2, new QStandardItem); + model->setItem(row, 3, new QStandardItem(si.name)); ++row; }