feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Set sensible placeholder text in shortcut edit.

Browse Source 
The "Key sequence" edit showed a wrong placeholder text for actions
without a shortcut.

Task-number: QTCREATORBUG-8109
Change-Id: I3764275e0c99cb53964b16ff4b06602c48661cf1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Eike Ziller
2013-03-04 17:51:41 +01:00
parent a0f3eeac40
commit 1eac160eb2
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/actionmanager/commandmappings.cpp
View File

@@ -65,6 +65,7 @@ QWidget *CommandMappings::createPage(QWidget *parent)
QWidget *w = new QWidget(parent); QWidget *w = new QWidget(parent);
m_page->setupUi(w); m_page->setupUi(w);
m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true); m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true);
m_page->targetEdit->setPlaceholderText(QString());
m_page->targetEdit->installEventFilter(this); m_page->targetEdit->installEventFilter(this);
connect(m_page->targetEdit, SIGNAL(buttonClicked(Utils::FancyLineEdit::Side)), connect(m_page->targetEdit, SIGNAL(buttonClicked(Utils::FancyLineEdit::Side)),

1
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -82,6 +82,7 @@ QWidget *ShortcutSettings::createPage(QWidget *parent)
setTargetLabelText(targetLabelText); setTargetLabelText(targetLabelText);
setTargetEditTitle(editTitle); setTargetEditTitle(editTitle);
setTargetHeader(editTitle); setTargetHeader(editTitle);
targetEdit()->setPlaceholderText(tr("Type to set shortcut"));
if (m_searchKeywords.isEmpty()) { if (m_searchKeywords.isEmpty()) {
QTextStream(&m_searchKeywords) << ' ' << pageTitle QTextStream(&m_searchKeywords) << ' ' << pageTitle