From 36a955fa1e20a6d4842468ac84d54305a9691150 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 1 Sep 2010 11:54:00 +0200
Subject: [PATCH] QuickToolbar: unifies naming to Quick ToolBar and clarifies
tooltips
---
src/libs/qmleditorwidgets/contextpanewidget.cpp | 8 ++++----
src/plugins/qmljseditor/qmljseditor.cpp | 2 +-
src/plugins/qmljseditor/qmljseditorplugin.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 1ee17cce094..6058905afa3 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -178,7 +178,7 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
m_toolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
m_toolButton->setFixedSize(16, 16);
- m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be permantly disabled in the options or in the context menu."));
+ m_toolButton->setToolTip(tr("Hides this toolbar."));
connect(m_toolButton, SIGNAL(clicked()), this, SLOT(onTogglePane()));
layout->addWidget(m_toolButton, 0, 0, 1, 1);
colorDialog();
@@ -198,12 +198,12 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
setAutoFillBackground(true);
setContextMenuPolicy(Qt::ActionsContextMenu);
- m_resetAction = new QAction(tr("Pin toolbar"), this);
+ m_resetAction = new QAction(tr("Pin Toolbar"), this);
m_resetAction->setCheckable(true);
addAction(m_resetAction.data());
connect(m_resetAction.data(), SIGNAL(triggered(bool)), this, SLOT(onResetPosition(bool)));
- m_disableAction = new QAction(tr("Show depending on context"), this);
+ m_disableAction = new QAction(tr("Show Always"), this);
addAction(m_disableAction.data());
m_disableAction->setCheckable(true);
connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool)));
@@ -476,7 +476,7 @@ void ContextPaneWidget::setPinButton()
m_toolButton->setIcon(QPixmap::fromImage(QImage(pin_xpm)));
m_toolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
m_toolButton->setFixedSize(20, 20);
- m_toolButton->setToolTip(tr("Unpins the toolbar. The toolbar will be moved to its default position."));
+ m_toolButton->setToolTip(tr("Unpins the toolbar and moves it to the default position."));
pinnedChanged(true);
if (m_resetAction) {
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 34d691a3a6c..7a5f3bf26c0 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -982,7 +982,7 @@ void QmlJSTextEditor::updateCursorPositionNow()
QTextCursor tc(document());
tc.setPosition(end);
marker.cursor = tc;
- marker.tooltip = tr("Show Qt Quick Helper");
+ marker.tooltip = tr("Show Qt Quick ToolBar");
markers.append(marker);
}
}
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 09e284a379c..727522dc0a1 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -145,7 +145,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
connect(followSymbolUnderCursorAction, SIGNAL(triggered()), this, SLOT(followSymbolUnderCursor()));
contextMenu->addAction(cmd);
- QAction *showQuickToolbar = new QAction(tr("Show Qt Quick helper"), this);
+ QAction *showQuickToolbar = new QAction(tr("Show Qt Quick Toolbar"), this);
cmd = am->registerAction(showQuickToolbar, Constants::SHOW_QT_QUICK_HELPER, context);
cmd->setDefaultKeySequence(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Space));
connect(showQuickToolbar, SIGNAL(triggered()), this, SLOT(showContextPane()));
--
GitLab