From b48f870b1f856d5f0cbb7de8d049a460b0bb5ace Mon Sep 17 00:00:00 2001 From: jolavillette Date: Sat, 1 Aug 2026 20:54:20 +0200 Subject: [PATCH] GUI: shorten the search placeholders and column headers to one word Requested in review: placeholders back to "Search", id column headers back to "Id". The multi-field search behaviour is unchanged, and the "Matched by search" tooltip still tells which field matched. Co-Authored-By: Claude Fable 5 --- retroshare-gui/src/gui/NetworkDialog.cpp | 2 +- retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp | 2 +- retroshare-gui/src/gui/common/FriendListModel.cpp | 2 +- retroshare-gui/src/gui/common/NewFriendList.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index 9d0aaba9b..f2805dfad 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -86,7 +86,7 @@ NetworkDialog::NetworkDialog(QWidget */*parent*/) ui.onlyTrustedKeys->setMinimumWidth(20*f); /* Global search: search by name, PGP ID, node ID, IP */ - ui.filterLineEdit->setPlaceholderText(tr("Search name, PGP ID, node ID, IP...")); + ui.filterLineEdit->setPlaceholderText(tr("Search")); connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), PGPIdItemProxy, SLOT(setFilterText(QString))); } diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp index d8622fe3f..5e6394e5c 100644 --- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp +++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp @@ -81,7 +81,7 @@ QVariant pgpid_item_model::headerData(int section, Qt::Orientation orientation, return QString(tr("Has signed your key?")); break; case PGP_ITEM_MODEL_COLUMN_PEERID: - return QString(tr("PGP ID")); + return QString(tr("Id")); break; case PGP_ITEM_MODEL_COLUMN_LAST_USED: return QString(tr("Last used")); diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp index ab3d7b202..89982916c 100644 --- a/retroshare-gui/src/gui/common/FriendListModel.cpp +++ b/retroshare-gui/src/gui/common/FriendListModel.cpp @@ -374,7 +374,7 @@ QVariant RsFriendListModel::headerData(int section, Qt::Orientation /*orientatio switch(section) { case COLUMN_THREAD_NAME: return tr("Name"); - case COLUMN_THREAD_ID: return tr("PGP / Node ID"); // PGP id on profile rows, node id on location rows + case COLUMN_THREAD_ID: return tr("Id"); // PGP id on profile rows, node id on location rows case COLUMN_THREAD_LAST_CONTACT: return tr("Last contact"); case COLUMN_THREAD_IP: return tr("IP"); default: diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp index c51d05e21..ddd0369f2 100644 --- a/retroshare-gui/src/gui/common/NewFriendList.cpp +++ b/retroshare-gui/src/gui/common/NewFriendList.cpp @@ -219,7 +219,7 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par int W = QFontMetricsF(ui->peerTreeWidget->font()).horizontalAdvance("_"); #endif - ui->filterLineEdit->setPlaceholderText(tr("Search name, PGP ID, node ID, IP...")) ; + ui->filterLineEdit->setPlaceholderText(tr("Search")) ; ui->filterLineEdit->showFilterIcon(); // mEventHandlerId_pssc=0; // forces initialization