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

VcsBase: Convert submiteditorwidget to Qt5 style connects

Browse Source 
Wrap lines that are too long while touching the file.

Change-Id: I209cf0f3c126748508d07ad1a5fdc7dea0d09c71
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-02-16 14:40:32 +01:00
parent f10f0b73d4
commit fc2c615c6a
1 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/plugins/vcsbase/submiteditorwidget.cpp
View File

@@ -92,8 +92,8 @@ QActionPushButton::QActionPushButton(QAction *a) :
setIcon(a->icon()); setIcon(a->icon());
setText(a->text()); setText(a->text());
setToolButtonStyle(Qt::ToolButtonTextBesideIcon); setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
connect(a, SIGNAL(changed()), this, SLOT(actionChanged())); connect(a, &QAction::changed, this, &QActionPushButton::actionChanged);
connect(this, SIGNAL(clicked()), a, SLOT(trigger())); connect(this, &QAbstractButton::clicked, a, &QAction::trigger);
setEnabled(a->isEnabled()); setEnabled(a->isEnabled());
} }
@@ -185,22 +185,22 @@ SubmitEditorWidget::SubmitEditorWidget() :
d->m_ui.description->setContextMenuPolicy(Qt::CustomContextMenu); d->m_ui.description->setContextMenuPolicy(Qt::CustomContextMenu);
d->m_ui.description->setLineWrapMode(QTextEdit::NoWrap); d->m_ui.description->setLineWrapMode(QTextEdit::NoWrap);
d->m_ui.description->setWordWrapMode(QTextOption::WordWrap); d->m_ui.description->setWordWrapMode(QTextOption::WordWrap);
connect(d->m_ui.description, SIGNAL(customContextMenuRequested(QPoint)), connect(d->m_ui.description, &QWidget::customContextMenuRequested,
this, SLOT(editorCustomContextMenuRequested(QPoint))); this, &SubmitEditorWidget::editorCustomContextMenuRequested);
connect(d->m_ui.description, SIGNAL(textChanged()), connect(d->m_ui.description, &QTextEdit::textChanged,
this, SLOT(descriptionTextChanged())); this, &SubmitEditorWidget::descriptionTextChanged);
// File List // File List
d->m_ui.fileView->setContextMenuPolicy(Qt::CustomContextMenu); d->m_ui.fileView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(d->m_ui.fileView, SIGNAL(customContextMenuRequested(QPoint)), connect(d->m_ui.fileView, &QWidget::customContextMenuRequested,
this, SLOT(fileListCustomContextMenuRequested(QPoint))); this, &SubmitEditorWidget::fileListCustomContextMenuRequested);
d->m_ui.fileView->setSelectionMode(QAbstractItemView::ExtendedSelection); d->m_ui.fileView->setSelectionMode(QAbstractItemView::ExtendedSelection);
d->m_ui.fileView->setRootIsDecorated(false); d->m_ui.fileView->setRootIsDecorated(false);
connect(d->m_ui.fileView, SIGNAL(doubleClicked(QModelIndex)), connect(d->m_ui.fileView, &QAbstractItemView::doubleClicked,
this, SLOT(diffActivated(QModelIndex))); this, &SubmitEditorWidget::diffActivated);
connect(d->m_ui.checkAllCheckBox, SIGNAL(stateChanged(int)), connect(d->m_ui.checkAllCheckBox, &QCheckBox::stateChanged,
this, SLOT(checkAllToggled())); this, &SubmitEditorWidget::checkAllToggled);
setFocusPolicy(Qt::StrongFocus); setFocusPolicy(Qt::StrongFocus);
setFocusProxy(d->m_ui.description); setFocusProxy(d->m_ui.description);
@@ -216,13 +216,15 @@ void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *edi
{ {
if (editorUndoAction) { if (editorUndoAction) {
editorUndoAction->setEnabled(d->m_ui.description->document()->isUndoAvailable()); editorUndoAction->setEnabled(d->m_ui.description->document()->isUndoAvailable());
connect(d->m_ui.description, SIGNAL(undoAvailable(bool)), editorUndoAction, SLOT(setEnabled(bool))); connect(d->m_ui.description, &QTextEdit::undoAvailable,
connect(editorUndoAction, SIGNAL(triggered()), d->m_ui.description, SLOT(undo())); editorUndoAction, &QAction::setEnabled);
connect(editorUndoAction, &QAction::triggered, d->m_ui.description, &QTextEdit::undo);
} }
if (editorRedoAction) { if (editorRedoAction) {
editorRedoAction->setEnabled(d->m_ui.description->document()->isRedoAvailable()); editorRedoAction->setEnabled(d->m_ui.description->document()->isRedoAvailable());
connect(d->m_ui.description, SIGNAL(redoAvailable(bool)), editorRedoAction, SLOT(setEnabled(bool))); connect(d->m_ui.description, &QTextEdit::redoAvailable,
connect(editorRedoAction, SIGNAL(triggered()), d->m_ui.description, SLOT(redo())); editorRedoAction, &QAction::setEnabled);
connect(editorRedoAction, &QAction::triggered, d->m_ui.description, &QTextEdit::redo);
} }
if (submitAction) { if (submitAction) {
@@ -232,24 +234,27 @@ void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *edi
qDebug() << Q_FUNC_INFO << submitAction << count << "items"; qDebug() << Q_FUNC_INFO << submitAction << count << "items";
} }
d->m_commitEnabled = !canSubmit(); d->m_commitEnabled = !canSubmit();
connect(this, SIGNAL(submitActionEnabledChanged(bool)), submitAction, SLOT(setEnabled(bool))); connect(this, &SubmitEditorWidget::submitActionEnabledChanged,
submitAction, &QAction::setEnabled);
// Wire setText via QActionSetTextSlotHelper. // Wire setText via QActionSetTextSlotHelper.
QActionSetTextSlotHelper *actionSlotHelper = submitAction->findChild<QActionSetTextSlotHelper *>(); QActionSetTextSlotHelper *actionSlotHelper
= submitAction->findChild<QActionSetTextSlotHelper *>();
if (!actionSlotHelper) if (!actionSlotHelper)
actionSlotHelper = new QActionSetTextSlotHelper(submitAction); actionSlotHelper = new QActionSetTextSlotHelper(submitAction);
connect(this, SIGNAL(submitActionTextChanged(QString)), actionSlotHelper, SLOT(setText(QString))); connect(this, &SubmitEditorWidget::submitActionTextChanged,
actionSlotHelper, &QActionSetTextSlotHelper::setText);
d->m_submitButton = new QActionPushButton(submitAction); d->m_submitButton = new QActionPushButton(submitAction);
d->m_ui.buttonLayout->addWidget(d->m_submitButton); d->m_ui.buttonLayout->addWidget(d->m_submitButton);
if (!d->m_submitShortcut) if (!d->m_submitShortcut)
d->m_submitShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this); d->m_submitShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this);
connect(d->m_submitShortcut, SIGNAL(activated()), submitAction, SLOT(trigger())); connect(d->m_submitShortcut, &QShortcut::activated, submitAction, &QAction::trigger);
} }
if (diffAction) { if (diffAction) {
if (debug) if (debug)
qDebug() << diffAction << d->m_filesSelected; qDebug() << diffAction << d->m_filesSelected;
diffAction->setEnabled(d->m_filesSelected); diffAction->setEnabled(d->m_filesSelected);
connect(this, SIGNAL(fileSelectionChanged(bool)), diffAction, SLOT(setEnabled(bool))); connect(this, &SubmitEditorWidget::fileSelectionChanged, diffAction, &QAction::setEnabled);
connect(diffAction, SIGNAL(triggered()), this, SLOT(triggerDiffSelected())); connect(diffAction, &QAction::triggered, this, &SubmitEditorWidget::triggerDiffSelected);
d->m_ui.buttonLayout->addWidget(new QActionPushButton(diffAction)); d->m_ui.buttonLayout->addWidget(new QActionPushButton(diffAction));
} }
} }
@@ -258,23 +263,30 @@ void SubmitEditorWidget::unregisterActions(QAction *editorUndoAction, QAction *
QAction *submitAction, QAction *diffAction) QAction *submitAction, QAction *diffAction)
{ {
if (editorUndoAction) { if (editorUndoAction) {
disconnect(d->m_ui.description, SIGNAL(undoAvailableChanged(bool)), editorUndoAction, SLOT(setEnabled(bool))); disconnect(d->m_ui.description, &Utils::CompletingTextEdit::undoAvailable,
disconnect(editorUndoAction, SIGNAL(triggered()), d->m_ui.description, SLOT(undo())); editorUndoAction, &QAction::setEnabled);
disconnect(editorUndoAction, &QAction::triggered,
d->m_ui.description, &Utils::CompletingTextEdit::undo);
} }
if (editorRedoAction) { if (editorRedoAction) {
disconnect(d->m_ui.description, SIGNAL(redoAvailableChanged(bool)), editorRedoAction, SLOT(setEnabled(bool))); disconnect(d->m_ui.description, &Utils::CompletingTextEdit::redoAvailable,
disconnect(editorRedoAction, SIGNAL(triggered()), d->m_ui.description, SLOT(redo())); editorRedoAction, &QAction::setEnabled);
disconnect(editorRedoAction, &QAction::triggered,
d->m_ui.description, &Utils::CompletingTextEdit::redo);
} }
if (submitAction) { if (submitAction) {
disconnect(this, SIGNAL(submitActionEnabledChanged(bool)), submitAction, SLOT(setEnabled(bool))); disconnect(this, &SubmitEditorWidget::submitActionEnabledChanged,
submitAction, &QAction::setEnabled);
// Just deactivate the QActionSetTextSlotHelper on the action // Just deactivate the QActionSetTextSlotHelper on the action
disconnect(this, SIGNAL(submitActionTextChanged(QString)), 0, 0); disconnect(this, &SubmitEditorWidget::submitActionTextChanged, 0, 0);
} }
if (diffAction) { if (diffAction) {
disconnect(this, SIGNAL(fileSelectionChanged(bool)), diffAction, SLOT(setEnabled(bool))); disconnect(this, &SubmitEditorWidget::fileSelectionChanged,
disconnect(diffAction, SIGNAL(triggered()), this, SLOT(triggerDiffSelected())); diffAction, &QAction::setEnabled);
disconnect(diffAction, &QAction::triggered,
this, &SubmitEditorWidget::triggerDiffSelected);
} }
} }
@@ -287,7 +299,9 @@ void SubmitEditorWidget::trimDescription()
// Trim back of string. // Trim back of string.
const int last = d->m_description.size() - 1; const int last = d->m_description.size() - 1;
int lastWordCharacter = last; int lastWordCharacter = last;
for ( ; lastWordCharacter >= 0 && d->m_description.at(lastWordCharacter).isSpace() ; lastWordCharacter--) ; for ( ; lastWordCharacter >= 0 && d->m_description.at(lastWordCharacter).isSpace() ;
lastWordCharacter--)
{ }
if (lastWordCharacter != last) if (lastWordCharacter != last)
d->m_description.truncate(lastWordCharacter + 1); d->m_description.truncate(lastWordCharacter + 1);
d->m_description += QLatin1Char('\n'); d->m_description += QLatin1Char('\n');
@@ -406,20 +420,20 @@ void SubmitEditorWidget::setFileModel(SubmitFileModel *model)
d->m_ui.fileView->resizeColumnToContents(c); d->m_ui.fileView->resizeColumnToContents(c);
} }
connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), connect(model, &QAbstractItemModel::dataChanged,
this, SLOT(updateSubmitAction())); this, &SubmitEditorWidget::updateSubmitAction);
connect(model, SIGNAL(modelReset()), connect(model, &QAbstractItemModel::modelReset,
this, SLOT(updateSubmitAction())); this, &SubmitEditorWidget::updateSubmitAction);
connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), connect(model, &QAbstractItemModel::dataChanged,
this, SLOT(updateCheckAllComboBox())); this, &SubmitEditorWidget::updateCheckAllComboBox);
connect(model, SIGNAL(modelReset()), connect(model, &QAbstractItemModel::modelReset,
this, SLOT(updateCheckAllComboBox())); this, &SubmitEditorWidget::updateCheckAllComboBox);
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), connect(model, &QAbstractItemModel::rowsInserted,
this, SLOT(updateSubmitAction())); this, &SubmitEditorWidget::updateSubmitAction);
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), connect(model, &QAbstractItemModel::rowsRemoved,
this, SLOT(updateSubmitAction())); this, &SubmitEditorWidget::updateSubmitAction);
connect(d->m_ui.fileView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), connect(d->m_ui.fileView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, SLOT(updateDiffAction())); this, &SubmitEditorWidget::updateDiffAction);
updateActions(); updateActions();
} }
@@ -616,19 +630,22 @@ QList<SubmitFieldWidget *> SubmitEditorWidget::submitFieldWidgets() const
void SubmitEditorWidget::addDescriptionEditContextMenuAction(QAction *a) void SubmitEditorWidget::addDescriptionEditContextMenuAction(QAction *a)
{ {
d->descriptionEditContextMenuActions.push_back(SubmitEditorWidgetPrivate::AdditionalContextMenuAction(-1, a)); d->descriptionEditContextMenuActions
.push_back(SubmitEditorWidgetPrivate::AdditionalContextMenuAction(-1, a));
} }
void SubmitEditorWidget::insertDescriptionEditContextMenuAction(int pos, QAction *a) void SubmitEditorWidget::insertDescriptionEditContextMenuAction(int pos, QAction *a)
{ {
d->descriptionEditContextMenuActions.push_back(SubmitEditorWidgetPrivate::AdditionalContextMenuAction(pos, a)); d->descriptionEditContextMenuActions
.push_back(SubmitEditorWidgetPrivate::AdditionalContextMenuAction(pos, a));
} }
void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos) void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
{ {
QScopedPointer<QMenu> menu(d->m_ui.description->createStandardContextMenu()); QScopedPointer<QMenu> menu(d->m_ui.description->createStandardContextMenu());
// Extend // Extend
foreach (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a, d->descriptionEditContextMenuActions) { foreach (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a,
d->descriptionEditContextMenuActions) {
if (a.second) { if (a.second) {
if (a.first >= 0) if (a.first >= 0)
menu->insertAction(menu->actions().at(a.first), a.second); menu->insertAction(menu->actions().at(a.first), a.second);