Moved CommandButton to Core and made some improvements to it.

Added constructor taking Id, use command description if toolTipBase
is not set.

Change-Id: I56d774e9c194c6f1eb90583f4a13ed75db540ba3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Konstantin Tokarev
2012-07-09 15:53:16 +04:00
committed by Eike Ziller
parent 889409f2cd
commit 67c4788755
7 changed files with 172 additions and 171 deletions

View File

@@ -0,0 +1,93 @@
/****************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Konstantin Tokarev.
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "commandbutton.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <utils/proxyaction.h>
using namespace Core;
/*!
\class Core::CommandButton
\brief A tool button associated with one of registered Command objects.
Tooltip of this button consists of toolTipBase property value and Command's
key sequence which is automatically updated when user changes it.
*/
CommandButton::CommandButton(QWidget *parent)
: QToolButton(parent)
, m_command(0)
{
}
CommandButton::CommandButton(Id id, QWidget *parent)
: QToolButton(parent)
, m_command(0)
{
setCommandId(id);
}
void CommandButton::setCommandId(Id id)
{
if (m_command)
disconnect(m_command, SIGNAL(keySequenceChanged()), this, SLOT(updateToolTip()));
m_command = ActionManager::command(id);
if (m_toolTipBase.isEmpty())
m_toolTipBase = m_command->description();
updateToolTip();
connect(m_command, SIGNAL(keySequenceChanged()), this, SLOT(updateToolTip()));
}
QString CommandButton::toolTipBase() const
{
return m_toolTipBase;
}
void CommandButton::setToolTipBase(const QString &toolTipBase)
{
m_toolTipBase = toolTipBase;
updateToolTip();
}
void CommandButton::updateToolTip()
{
if (m_command)
setToolTip(Utils::ProxyAction::stringWithAppendedShortcut(m_toolTipBase,
m_command->keySequence()));
}

View File

@@ -0,0 +1,68 @@
/****************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Konstantin Tokarev.
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef COMMANDBUTTON_H
#define COMMANDBUTTON_H
#include <coreplugin/core_global.h>
#include <QPointer>
#include <QString>
#include <QToolButton>
namespace Core {
class Command;
class Id;
class CORE_EXPORT CommandButton : public QToolButton
{
Q_OBJECT
Q_PROPERTY(QString toolTipBase READ toolTipBase WRITE setToolTipBase)
public:
explicit CommandButton(QWidget *parent = 0);
explicit CommandButton(Id id, QWidget *parent = 0);
void setCommandId(Id id);
QString toolTipBase() const;
void setToolTipBase(const QString &toolTipBase);
private slots:
void updateToolTip();
private:
QPointer<Core::Command> m_command;
QString m_toolTipBase;
};
}
#endif // COMMANDBUTTON_H

View File

@@ -41,6 +41,7 @@ SOURCES += mainwindow.cpp \
editormanager/iexternaleditor.cpp \
actionmanager/actionmanager.cpp \
actionmanager/command.cpp \
actionmanager/commandbutton.cpp \
actionmanager/actioncontainer.cpp \
actionmanager/commandsfile.cpp \
dialogs/saveitemsdialog.cpp \
@@ -122,6 +123,7 @@ HEADERS += mainwindow.h \
actionmanager/actioncontainer.h \
actionmanager/actionmanager.h \
actionmanager/command.h \
actionmanager/commandbutton.h \
actionmanager/actionmanager_p.h \
actionmanager/command_p.h \
actionmanager/actioncontainer_p.h \