forked from qt-creator/qt-creator
The macros plugin use a directory in userResourcePath.
It is not possible to manage different directory for the macro plugin, it uses the user resource path per default. This change cleans a lot of code, specially we don't need any specific settings for the macro plugin, and the option page is more simple. Merge-request: 240 Reviewed-by: con <qtc-committer@nokia.com>
This commit is contained in:
Nicolas Arnaud-Cormos
committed by
con
con
parent
23e024de64
commit
acf607f009
@@ -33,13 +33,13 @@
|
||||
|
||||
#include "macrooptionswidget.h"
|
||||
#include "ui_macrooptionswidget.h"
|
||||
#include "macrosettings.h"
|
||||
#include "macrosconstants.h"
|
||||
#include "macromanager.h"
|
||||
#include "macro.h"
|
||||
#include "macrosconstants.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/coreconstants.h>
|
||||
#include <coreplugin/actionmanager/actionmanager.h>
|
||||
#include <coreplugin/actionmanager/command.h>
|
||||
#include <coreplugin/uniqueidmanager.h>
|
||||
@@ -58,13 +58,8 @@
|
||||
#include <QtGui/QLineEdit>
|
||||
|
||||
namespace {
|
||||
int DIRECTORY = 1;
|
||||
int MACRO = 2;
|
||||
|
||||
int DEFAULT_ROLE = Qt::UserRole;
|
||||
int NAME_ROLE = Qt::UserRole;
|
||||
int WRITE_ROLE = Qt::UserRole+1;
|
||||
int ID_ROLE = Qt::UserRole+2;
|
||||
}
|
||||
|
||||
using namespace Macros;
|
||||
@@ -73,53 +68,42 @@ using namespace Macros::Internal;
|
||||
|
||||
MacroOptionsWidget::MacroOptionsWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::MacroOptionsWidget),
|
||||
changingCurrent(false)
|
||||
m_ui(new Ui::MacroOptionsWidget),
|
||||
m_changingCurrent(false)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
m_ui->setupUi(this);
|
||||
m_ui->removeButton->setIcon(QIcon(Core::Constants::ICON_MINUS));
|
||||
|
||||
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
|
||||
connect(m_ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
|
||||
this, SLOT(changeCurrentItem(QTreeWidgetItem*)));
|
||||
connect(ui->removeButton, SIGNAL(clicked()),
|
||||
connect(m_ui->removeButton, SIGNAL(clicked()),
|
||||
this, SLOT(remove()));
|
||||
connect(ui->defaultButton, SIGNAL(clicked()),
|
||||
this, SLOT(setDefault()));
|
||||
connect(ui->addButton, SIGNAL(clicked()),
|
||||
this, SLOT(addDirectoy()));
|
||||
connect(ui->description, SIGNAL(textChanged(QString)),
|
||||
connect(m_ui->description, SIGNAL(textChanged(QString)),
|
||||
this, SLOT(changeDescription(QString)));
|
||||
|
||||
ui->treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder);
|
||||
m_ui->treeWidget->header()->setSortIndicator(0, Qt::AscendingOrder);
|
||||
|
||||
initialize();
|
||||
}
|
||||
|
||||
MacroOptionsWidget::~MacroOptionsWidget()
|
||||
{
|
||||
delete ui;
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::setSettings(const MacroSettings &s)
|
||||
void MacroOptionsWidget::initialize()
|
||||
{
|
||||
m_macroToRemove.clear();
|
||||
m_macroToChange.clear();
|
||||
m_directories.clear();
|
||||
ui->treeWidget->clear();
|
||||
m_ui->treeWidget->clear();
|
||||
|
||||
// Create the treeview
|
||||
foreach (const QString &dir, s.directories)
|
||||
appendDirectory(dir, s.defaultDirectory==dir);
|
||||
m_directories = s.directories;
|
||||
createTable();
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::appendDirectory(const QString &directory, bool isDefault)
|
||||
void MacroOptionsWidget::createTable()
|
||||
{
|
||||
QDir dir(directory);
|
||||
QTreeWidgetItem *dirItem = new QTreeWidgetItem(ui->treeWidget, DIRECTORY);
|
||||
dirItem->setText(0, dir.absolutePath());
|
||||
dirItem->setData(0, DEFAULT_ROLE, isDefault);
|
||||
dirItem->setFirstColumnSpanned(true);
|
||||
if (isDefault)
|
||||
dirItem->setIcon(0, QPixmap(":/extensionsystem/images/ok.png"));
|
||||
|
||||
QDir dir(MacroManager::instance()->macrosDirectory());
|
||||
Core::ICore *core = Core::ICore::instance();
|
||||
Core::ActionManager *am = core->actionManager();
|
||||
|
||||
@@ -128,7 +112,7 @@ void MacroOptionsWidget::appendDirectory(const QString &directory, bool isDefaul
|
||||
it.next();
|
||||
QFileInfo fileInfo(it.value()->fileName());
|
||||
if (fileInfo.absoluteDir() == dir.absolutePath()) {
|
||||
QTreeWidgetItem *macroItem = new QTreeWidgetItem(dirItem, MACRO);
|
||||
QTreeWidgetItem *macroItem = new QTreeWidgetItem(m_ui->treeWidget);
|
||||
macroItem->setText(0, it.value()->displayName());
|
||||
macroItem->setText(1, it.value()->description());
|
||||
macroItem->setData(0, NAME_ROLE, it.value()->displayName());
|
||||
@@ -141,122 +125,58 @@ void MacroOptionsWidget::appendDirectory(const QString &directory, bool isDefaul
|
||||
}
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::addDirectoy()
|
||||
{
|
||||
QString directory = ui->directoryPathChooser->path();
|
||||
appendDirectory(directory, ui->treeWidget->children().count()==0);
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::changeCurrentItem(QTreeWidgetItem *current)
|
||||
{
|
||||
changingCurrent = true;
|
||||
m_changingCurrent = true;
|
||||
if (!current) {
|
||||
ui->removeButton->setEnabled(false);
|
||||
ui->defaultButton->setEnabled(false);
|
||||
ui->description->clear();
|
||||
ui->macroGroup->setEnabled(false);
|
||||
}
|
||||
else if (current->type() == DIRECTORY) {
|
||||
bool isDefault = current->data(0, DEFAULT_ROLE).toBool();
|
||||
ui->removeButton->setEnabled(!isDefault);
|
||||
ui->defaultButton->setEnabled(!isDefault);
|
||||
ui->description->clear();
|
||||
ui->macroGroup->setEnabled(false);
|
||||
m_ui->removeButton->setEnabled(false);
|
||||
m_ui->description->clear();
|
||||
m_ui->macroGroup->setEnabled(false);
|
||||
} else {
|
||||
ui->removeButton->setEnabled(true);
|
||||
ui->defaultButton->setEnabled(false);
|
||||
ui->description->setText(current->text(1));
|
||||
ui->description->setEnabled(current->data(0, WRITE_ROLE).toBool());
|
||||
ui->macroGroup->setEnabled(true);
|
||||
m_ui->removeButton->setEnabled(true);
|
||||
m_ui->description->setText(current->text(1));
|
||||
m_ui->description->setEnabled(current->data(0, WRITE_ROLE).toBool());
|
||||
m_ui->macroGroup->setEnabled(true);
|
||||
}
|
||||
changingCurrent = false;
|
||||
m_changingCurrent = false;
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::remove()
|
||||
{
|
||||
QTreeWidgetItem *current = ui->treeWidget->currentItem();
|
||||
if (current->type() == MACRO)
|
||||
m_macroToRemove.append(current->text(0));
|
||||
QTreeWidgetItem *current = m_ui->treeWidget->currentItem();
|
||||
m_macroToRemove.append(current->data(0, NAME_ROLE).toString());
|
||||
delete current;
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::setDefault()
|
||||
{
|
||||
QTreeWidgetItem *current = ui->treeWidget->currentItem();
|
||||
if (!current || current->type() != DIRECTORY)
|
||||
return;
|
||||
|
||||
for (int i = 0; i < ui->treeWidget->topLevelItemCount(); ++i) {
|
||||
QTreeWidgetItem *item = ui->treeWidget->topLevelItem(i);
|
||||
if (item->data(0, DEFAULT_ROLE).toBool()) {
|
||||
item->setIcon(0, QPixmap());
|
||||
item->setData(0, DEFAULT_ROLE, false);
|
||||
}
|
||||
}
|
||||
|
||||
current->setData(0, DEFAULT_ROLE, true);
|
||||
current->setIcon(0, QPixmap(":/extensionsystem/images/ok.png"));
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::apply()
|
||||
{
|
||||
// Remove macro
|
||||
foreach (const QString &name, m_macroToRemove)
|
||||
foreach (const QString &name, m_macroToRemove) {
|
||||
MacroManager::instance()->deleteMacro(name);
|
||||
m_macroToChange.remove(name);
|
||||
}
|
||||
|
||||
// Change macro
|
||||
QMapIterator<QString, ChangeSet> it(m_macroToChange);
|
||||
QMapIterator<QString, QString> it(m_macroToChange);
|
||||
while (it.hasNext()) {
|
||||
it.next();
|
||||
MacroManager::instance()->changeMacro(it.key(), it.value().description);
|
||||
MacroManager::instance()->changeMacro(it.key(), it.value());
|
||||
}
|
||||
|
||||
// Get list of dir to append or remove
|
||||
QStringList dirToAppend;
|
||||
QStringList dirToRemove = m_directories;
|
||||
for (int i = 0; i < ui->treeWidget->topLevelItemCount(); ++i) {
|
||||
QTreeWidgetItem *item = ui->treeWidget->topLevelItem(i);
|
||||
if (!m_directories.contains(item->text(0)))
|
||||
dirToAppend.append(item->text(0));
|
||||
dirToRemove.removeAll(item->text(0));
|
||||
if (item->data(0, DEFAULT_ROLE).toBool())
|
||||
MacroManager::instance()->setDefaultDirectory(item->text(0));
|
||||
}
|
||||
|
||||
// Append/remove directory
|
||||
foreach (const QString &dir, dirToAppend)
|
||||
MacroManager::instance()->appendDirectory(dir);
|
||||
foreach (const QString &dir, dirToRemove)
|
||||
MacroManager::instance()->removeDirectory(dir);
|
||||
|
||||
MacroManager::instance()->saveSettings();
|
||||
|
||||
// Reinitialize the page
|
||||
setSettings(MacroManager::instance()->settings());
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::changeData(QTreeWidgetItem *current, int column, QVariant value)
|
||||
{
|
||||
QString macroName = current->data(0, NAME_ROLE).toString();
|
||||
if (!m_macroToChange.contains(macroName)) {
|
||||
m_macroToChange[macroName].description = current->text(1);
|
||||
m_macroToChange[macroName].shortcut = (current->data(0, ID_ROLE).toInt() >= 0);
|
||||
}
|
||||
|
||||
// Change the description
|
||||
if (column == 1) {
|
||||
m_macroToChange[macroName].description = value.toString();
|
||||
current->setText(1, value.toString());
|
||||
QFont font = current->font(1);
|
||||
font.setItalic(true);
|
||||
current->setFont(1, font);
|
||||
}
|
||||
initialize();
|
||||
}
|
||||
|
||||
void MacroOptionsWidget::changeDescription(const QString &description)
|
||||
{
|
||||
QTreeWidgetItem *current = ui->treeWidget->currentItem();
|
||||
if (changingCurrent || !current || current->type() == DIRECTORY)
|
||||
QTreeWidgetItem *current = m_ui->treeWidget->currentItem();
|
||||
if (m_changingCurrent || !current)
|
||||
return;
|
||||
changeData(current, 1, description);
|
||||
|
||||
QString macroName = current->data(0, NAME_ROLE).toString();
|
||||
m_macroToChange[macroName] = description;
|
||||
current->setText(1, description);
|
||||
QFont font = current->font(1);
|
||||
font.setItalic(true);
|
||||
current->setFont(1, font);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user