Commit af3b1ce7 authored by Martin Aumüller's avatar Martin Aumüller Committed by Daniel Molkentin
Browse files

factor out the commonalities between the keyboard shortcut & ex command mapping dialog



Merge-request: 125
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent c5b53739
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, 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.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#include "commandmappings.h"
#include "ui_commandmappings.h"
#include "actionmanager_p.h"
#include "actionmanager/command.h"
#include "command_p.h"
#include "commandsfile.h"
#include "coreconstants.h"
#include "filemanager.h"
#include "icore.h"
#include "uniqueidmanager.h"
#include <utils/treewidgetcolumnstretcher.h>
#include <QtGui/QKeyEvent>
#include <QtGui/QShortcut>
#include <QtGui/QHeaderView>
#include <QtGui/QFileDialog>
#include <QtCore/QCoreApplication>
#include <QtDebug>
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*);
using namespace Core;
using namespace Core::Internal;
CommandMappings::CommandMappings(QObject *parent)
: IOptionsPage(parent)
{
}
CommandMappings::~CommandMappings()
{
}
// IOptionsPage
QString CommandMappings::id() const
{
return QLatin1String("D.Keyboard");
}
QString CommandMappings::displayName() const
{
return tr("Keyboard");
}
QString CommandMappings::category() const
{
return QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE);
}
QString CommandMappings::displayCategory() const
{
return QCoreApplication::translate("Core", Core::Constants::SETTINGS_TR_CATEGORY_CORE);
}
QWidget *CommandMappings::createPage(QWidget *parent)
{
m_page = new Ui_CommandMappings();
QWidget *w = new QWidget(parent);
m_page->setupUi(w);
m_page->resetButton->setIcon(QIcon(Constants::ICON_RESET));
m_page->targetEdit->installEventFilter(this);
connect(m_page->resetButton, SIGNAL(clicked()),
this, SLOT(resetTargetIdentifier()));
connect(m_page->removeButton, SIGNAL(clicked()),
this, SLOT(removeTargetIdentifier()));
connect(m_page->exportButton, SIGNAL(clicked()),
this, SLOT(exportAction()));
connect(m_page->importButton, SIGNAL(clicked()),
this, SLOT(importAction()));
connect(m_page->defaultButton, SIGNAL(clicked()),
this, SLOT(defaultAction()));
initialize();
m_page->commandList->sortByColumn(0, Qt::AscendingOrder);
connect(m_page->filterEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(commandChanged(QTreeWidgetItem *)));
connect(m_page->targetEdit, SIGNAL(textChanged(QString)), this, SLOT(targetIdentifierChanged()));
new Utils::TreeWidgetColumnStretcher(m_page->commandList, 1);
commandChanged(0);
return w;
}
void CommandMappings::setImportExportEnabled(bool enabled)
{
m_page->importButton->setVisible(enabled);
m_page->exportButton->setVisible(enabled);
}
QTreeWidget *CommandMappings::commandList() const
{
return m_page->commandList;
}
QLineEdit *CommandMappings::targetEdit() const
{
return m_page->targetEdit;
}
void CommandMappings::setPageTitle(QString s)
{
m_page->groupBox->setTitle(s);
}
void CommandMappings::setTargetLabelText(QString s)
{
m_page->targetEditLabel->setText(s);
}
void CommandMappings::setTargetEditTitle(QString s)
{
m_page->targetEditGroup->setTitle(s);
}
void CommandMappings::setTargetHeader(QString s)
{
m_page->commandList->setHeaderLabels(QStringList() << tr("Command") << tr("Label") << s);
}
void CommandMappings::finish()
{
delete m_page;
}
void CommandMappings::commandChanged(QTreeWidgetItem *current)
{
if (!current || !current->data(0, Qt::UserRole).isValid()) {
m_page->targetEdit->setText("");
m_page->targetEditGroup->setEnabled(false);
return;
}
m_page->targetEditGroup->setEnabled(true);
}
void CommandMappings::filterChanged(const QString &f)
{
for (int i=0; i<m_page->commandList->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = m_page->commandList->topLevelItem(i);
item->setHidden(filter(f, item));
}
}
bool CommandMappings::filter(const QString &f, const QTreeWidgetItem *item)
{
if (QTreeWidgetItem *parent = item->parent()) {
if (parent->text(0).contains(f, Qt::CaseInsensitive))
return false;
}
if (item->childCount() == 0) {
if (f.isEmpty())
return false;
for (int i = 0; i < item->columnCount(); ++i) {
if (item->text(i).contains(f, Qt::CaseInsensitive))
return false;
}
return true;
}
bool found = false;
for (int i = 0; i < item->childCount(); ++i) {
QTreeWidgetItem *citem = item->child(i);
if (filter(f, citem)) {
citem->setHidden(true);
} else {
citem->setHidden(false);
found = true;
}
}
return !found;
}
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, 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.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
#ifndef COMMANDMAPPINGS_H
#define COMMANDMAPPINGS_H
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QObject>
#include <QtGui/QKeySequence>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QKeyEvent>
class QLineEdit;
class QTreeWidget;
QT_BEGIN_NAMESPACE
class Ui_CommandMappings;
QT_END_NAMESPACE
namespace Core {
class Command;
namespace Internal {
class ActionManagerPrivate;
class MainWindow;
}
class CORE_EXPORT CommandMappings : public Core::IOptionsPage
{
Q_OBJECT
public:
CommandMappings(QObject *parent = 0);
~CommandMappings();
// IOptionsPage
virtual QString id() const = 0;
virtual QString displayName() const = 0;
virtual QString category() const = 0;
virtual QString displayCategory() const = 0;
protected slots:
void commandChanged(QTreeWidgetItem *current);
void filterChanged(const QString &f);
virtual void importAction() {}
virtual void exportAction() {}
virtual void defaultAction() = 0;
protected:
// IOptionsPage
QWidget *createPage(QWidget *parent);
virtual void apply() {}
virtual void finish();
virtual void initialize() = 0;
bool filter(const QString &f, const QTreeWidgetItem *item);
// access to m_page
void setImportExportEnabled(bool enabled);
QTreeWidget *commandList() const;
QLineEdit *targetEdit() const;
void setPageTitle(QString s);
void setTargetLabelText(QString s);
void setTargetEditTitle(QString s);
void setTargetHeader(QString s);
private:
Ui_CommandMappings *m_page;
};
} // namespace Core
#endif // COMMANDMAPPINGS_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ShortcutSettings</class>
<widget class="QWidget" name="ShortcutSettings">
<class>CommandMappings</class>
<widget class="QWidget" name="CommandMappings">
<property name="geometry">
<rect>
<x>0</x>
......@@ -14,7 +14,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Keyboard Shortcuts</string>
<string>Command Mappings</string>
</property>
<layout class="QVBoxLayout">
<item>
......@@ -57,7 +57,7 @@
</column>
<column>
<property name="text">
<string>Shortcut</string>
<string>Target</string>
</property>
</column>
</widget>
......@@ -104,22 +104,22 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="seqGrp">
<widget class="QGroupBox" name="targetEditGroup">
<property name="title">
<string>Key Sequence</string>
<string>Target Identifier</string>
</property>
<layout class="QVBoxLayout">
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="targetEditLabel">
<property name="text">
<string>Shortcut:</string>
<string>Target:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="shortcutEdit"/>
<widget class="QLineEdit" name="targetEdit"/>
</item>
<item>
<widget class="QToolButton" name="resetButton">
......
......@@ -47,6 +47,7 @@ SOURCES += mainwindow.cpp \
dialogs/saveitemsdialog.cpp \
dialogs/newdialog.cpp \
dialogs/settingsdialog.cpp \
actionmanager/commandmappings.cpp \
dialogs/shortcutsettings.cpp \
dialogs/openwithdialog.cpp \
progressmanager/progressmanager.cpp \
......@@ -116,6 +117,7 @@ HEADERS += mainwindow.h \
dialogs/saveitemsdialog.h \
dialogs/newdialog.h \
dialogs/settingsdialog.h \
actionmanager/commandmappings.h \
dialogs/shortcutsettings.h \
dialogs/openwithdialog.h \
dialogs/iwizard.h \
......@@ -166,7 +168,7 @@ HEADERS += mainwindow.h \
editortoolbar.h
FORMS += dialogs/newdialog.ui \
dialogs/shortcutsettings.ui \
actionmanager/commandmappings.ui \
dialogs/saveitemsdialog.ui \
dialogs/openwithdialog.ui \
editormanager/openeditorsview.ui \
......
......@@ -28,7 +28,6 @@
**************************************************************************/
#include "shortcutsettings.h"
#include "ui_shortcutsettings.h"
#include "actionmanager_p.h"
#include "actionmanager/command.h"
#include "command_p.h"
......@@ -44,6 +43,7 @@
#include <QtGui/QShortcut>
#include <QtGui/QHeaderView>
#include <QtGui/QFileDialog>
#include <QtGui/QLineEdit>
#include <QtCore/QCoreApplication>
#include <QtDebug>
......@@ -53,7 +53,7 @@ using namespace Core;
using namespace Core::Internal;
ShortcutSettings::ShortcutSettings(QObject *parent)
: IOptionsPage(parent)
: CommandMappings(parent)
{
}
......@@ -88,36 +88,11 @@ QWidget *ShortcutSettings::createPage(QWidget *parent)
{
m_keyNum = m_key[0] = m_key[1] = m_key[2] = m_key[3] = 0;
m_page = new Ui_ShortcutSettings();
QWidget *w = new QWidget(parent);
m_page->setupUi(w);
m_page->resetButton->setIcon(QIcon(Constants::ICON_RESET));
m_page->shortcutEdit->installEventFilter(this);
connect(m_page->resetButton, SIGNAL(clicked()),
this, SLOT(resetKeySequence()));
connect(m_page->removeButton, SIGNAL(clicked()),
this, SLOT(removeKeySequence()));
connect(m_page->exportButton, SIGNAL(clicked()),
this, SLOT(exportAction()));
connect(m_page->importButton, SIGNAL(clicked()),
this, SLOT(importAction()));
connect(m_page->defaultButton, SIGNAL(clicked()),
this, SLOT(defaultAction()));
initialize();
m_page->commandList->sortByColumn(0, Qt::AscendingOrder);
connect(m_page->filterEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(commandChanged(QTreeWidgetItem *)));
connect(m_page->shortcutEdit, SIGNAL(textChanged(QString)), this, SLOT(keyChanged()));
new Utils::TreeWidgetColumnStretcher(m_page->commandList, 1);
commandChanged(0);
QWidget *w = CommandMappings::createPage(parent);
setPageTitle(tr("Keyboard Shortcuts"));
setTargetLabelText(tr("Shortcut:"));
setTargetEditTitle(tr("Keyboard Shortcuts"));
setTargetHeader(tr("Shortcut"));
return w;
}
......@@ -133,7 +108,7 @@ void ShortcutSettings::finish()
qDeleteAll(m_scitems);
m_scitems.clear();
delete m_page;
CommandMappings::finish();
}
bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
......@@ -156,27 +131,16 @@ bool ShortcutSettings::eventFilter(QObject *o, QEvent *e)
void ShortcutSettings::commandChanged(QTreeWidgetItem *current)
{
if (!current || !current->data(0, Qt::UserRole).isValid()) {
m_page->shortcutEdit->setText("");
m_page->seqGrp->setEnabled(false);
CommandMappings::commandChanged(current);
if (!current || !current->data(0, Qt::UserRole).isValid())
return;
}
m_page->seqGrp->setEnabled(true);
ShortcutItem *scitem = qVariantValue<ShortcutItem *>(current->data(0, Qt::UserRole));
setKeySequence(scitem->m_key);
}
void ShortcutSettings::filterChanged(const QString &f)
{
for (int i=0; i<m_page->commandList->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = m_page->commandList->topLevelItem(i);
item->setHidden(filter(f, item));
}
}
void ShortcutSettings::keyChanged()
void ShortcutSettings::targetIdentifierChanged()
{
QTreeWidgetItem *current = m_page->commandList->currentItem();
QTreeWidgetItem *current = commandList()->currentItem();
if (current && current->data(0, Qt::UserRole).isValid()) {
ShortcutItem *scitem = qVariantValue<ShortcutItem *>(current->data(0, Qt::UserRole));
scitem->m_key = QKeySequence(m_key[0], m_key[1], m_key[2], m_key[3]);
......@@ -206,53 +170,22 @@ void ShortcutSettings::setKeySequence(const QKeySequence &key)
for (int i = 0; i < m_keyNum; ++i) {
m_key[i] = key[i];
}
m_page->shortcutEdit->setText(key);
}
bool ShortcutSettings::filter(const QString &f, const QTreeWidgetItem *item)
{
if (QTreeWidgetItem *parent = item->parent()) {
if (parent->text(0).contains(f, Qt::CaseInsensitive))
return false;
}
if (item->childCount() == 0) {
if (f.isEmpty())
return false;
for (int i = 0; i < item->columnCount(); ++i) {
if (item->text(i).contains(f, Qt::CaseInsensitive))
return false;
}
return true;
}
bool found = false;
for (int i = 0; i < item->childCount(); ++i) {
QTreeWidgetItem *citem = item->child(i);
if (filter(f, citem)) {
citem->setHidden(true);
} else {
citem->setHidden(false);
found = true;
}
}
return !found;
targetEdit()->setText(key);
}
void ShortcutSettings::resetKeySequence()
void ShortcutSettings::resetTargetIdentifier()
{
QTreeWidgetItem *current = m_page->commandList->currentItem();
QTreeWidgetItem *current = commandList()->currentItem();
if (current && current->data(0, Qt::UserRole).isValid()) {
ShortcutItem *scitem = qVariantValue<ShortcutItem *>(current->data(0, Qt::UserRole));
setKeySequence(scitem->m_cmd->defaultKeySequence());
}
}
void ShortcutSettings::removeKeySequence()
void ShortcutSettings::removeTargetIdentifier()
{
m_keyNum = m_key[0] = m_key[1] = m_key[2] = m_key[3] = 0;
m_page->shortcutEdit->clear();
targetEdit()->clear();
}
void ShortcutSettings::importAction()
......@@ -271,7 +204,7 @@ void ShortcutSettings::importAction()
if (mapping.contains(sid)) {
item->m_key = mapping.value(sid);
item->m_item->setText(2, item->m_key);
if (item->m_item == m_page->commandList->currentItem())
if (item->m_item == commandList()->currentItem())
commandChanged(item->m_item);
}
}
......@@ -283,7 +216,7 @@ void ShortcutSettings::defaultAction()
foreach (ShortcutItem *item, m_scitems) {
item->m_key = item->m_cmd->defaultKeySequence();
item->m_item->setText(2, item->m_key);
if (item->m_item == m_page->commandList->currentItem())
if (item->m_item == commandList()->currentItem())
commandChanged(item->m_item);
}
}
......@@ -303,12 +236,12 @@ void ShortcutSettings::exportAction()
void ShortcutSettings::initialize()
{
m_am = ActionManagerPrivate::instance();
Core::Internal::ActionManagerPrivate *am = ActionManagerPrivate::instance();
UniqueIDManager *uidm = UniqueIDManager::instance();
QMap<QString, QTreeWidgetItem *> sections;
foreach (Command *c, m_am->commands()) {
foreach (Command *c, am->commands()) {
if (c->hasAttribute(Command::CA_NonConfigureable))
continue;
if (c->action() && c->action()->isSeparator())
......@@ -326,12 +259,12 @@ void ShortcutSettings::initialize()
const QString section = identifier.left(pos);
const QString subId = identifier.mid(pos+1);
if (!sections.contains(section)) {
QTreeWidgetItem *categoryItem = new QTreeWidgetItem(m_page->commandList, QStringList() << section);