forked from qt-creator/qt-creator
VCS: Clean up code for vcs toolbar
It has been hidden since 5d316a4919
Change-Id: Id6808dc5546bb5cf500032b4b03ab3fc06c14501
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -54,7 +54,6 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
enum { debug = 0 };
|
enum { debug = 0 };
|
||||||
enum { wantToolBar = 0 };
|
|
||||||
|
|
||||||
// Return true if word is meaningful and can be added to a completion model
|
// Return true if word is meaningful and can be added to a completion model
|
||||||
static bool acceptsWordForCompletion(const QString &word)
|
static bool acceptsWordForCompletion(const QString &word)
|
||||||
@@ -115,7 +114,6 @@ public:
|
|||||||
VcsBaseSubmitEditor *q);
|
VcsBaseSubmitEditor *q);
|
||||||
|
|
||||||
SubmitEditorWidget *m_widget;
|
SubmitEditorWidget *m_widget;
|
||||||
QToolBar *m_toolWidget = nullptr;
|
|
||||||
VcsBaseSubmitEditorParameters m_parameters;
|
VcsBaseSubmitEditorParameters m_parameters;
|
||||||
QString m_displayName;
|
QString m_displayName;
|
||||||
FilePath m_checkScriptWorkingDirectory;
|
FilePath m_checkScriptWorkingDirectory;
|
||||||
@@ -224,7 +222,6 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
|
|||||||
|
|
||||||
VcsBaseSubmitEditor::~VcsBaseSubmitEditor()
|
VcsBaseSubmitEditor::~VcsBaseSubmitEditor()
|
||||||
{
|
{
|
||||||
delete d->m_toolWidget;
|
|
||||||
delete d->m_widget;
|
delete d->m_widget;
|
||||||
delete d;
|
delete d;
|
||||||
}
|
}
|
||||||
@@ -338,38 +335,6 @@ void VcsBaseSubmitEditor::setCheckScriptWorkingDirectory(const FilePath &s)
|
|||||||
d->m_checkScriptWorkingDirectory = s;
|
d->m_checkScriptWorkingDirectory = s;
|
||||||
}
|
}
|
||||||
|
|
||||||
static QToolBar *createToolBar(const QWidget *someWidget, QAction *submitAction, QAction *diffAction)
|
|
||||||
{
|
|
||||||
// Create
|
|
||||||
auto toolBar = new QToolBar;
|
|
||||||
toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
|
|
||||||
const int size = someWidget->style()->pixelMetric(QStyle::PM_SmallIconSize);
|
|
||||||
toolBar->setIconSize(QSize(size, size));
|
|
||||||
toolBar->addSeparator();
|
|
||||||
|
|
||||||
if (submitAction)
|
|
||||||
toolBar->addAction(submitAction);
|
|
||||||
if (diffAction)
|
|
||||||
toolBar->addAction(diffAction);
|
|
||||||
return toolBar;
|
|
||||||
}
|
|
||||||
|
|
||||||
QWidget *VcsBaseSubmitEditor::toolBar()
|
|
||||||
{
|
|
||||||
if (!wantToolBar)
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
if (d->m_toolWidget)
|
|
||||||
return d->m_toolWidget;
|
|
||||||
|
|
||||||
if (!d->m_diffAction && !d->m_submitAction)
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
// Create
|
|
||||||
d->m_toolWidget = createToolBar(d->m_widget, d->m_submitAction, d->m_diffAction);
|
|
||||||
return d->m_toolWidget;
|
|
||||||
}
|
|
||||||
|
|
||||||
QStringList VcsBaseSubmitEditor::checkedFiles() const
|
QStringList VcsBaseSubmitEditor::checkedFiles() const
|
||||||
{
|
{
|
||||||
return d->m_widget->checkedFiles();
|
return d->m_widget->checkedFiles();
|
||||||
|
@@ -68,7 +68,7 @@ public:
|
|||||||
|
|
||||||
Core::IDocument *document() const override;
|
Core::IDocument *document() const override;
|
||||||
|
|
||||||
QWidget *toolBar() override;
|
QWidget *toolBar() override { return nullptr; }
|
||||||
|
|
||||||
QStringList checkedFiles() const;
|
QStringList checkedFiles() const;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user