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

VCS: Replace QToolButtons in VCS toolbar with QActions

Browse Source 
Change VcsBaseEditorParameterWidget to add actions/widgets to an
existing toolbar, instead of being a widget itself.

The class is renamed in a follow-up commit.

Task-number: QTCREATORBUG-14934
Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Jarek Kobus
2015-08-24 13:39:40 +02:00
committed by Orgad Shaneh
parent 6cd68d5401
commit 2c6adc1e74
14 changed files with 163 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -54,8 +54,8 @@ class MercurialDiffParameterWidget : public VcsBaseEditorParameterWidget
{
Q_OBJECT
public:
MercurialDiffParameterWidget(VcsBaseClientSettings &settings, QWidget *parent = 0) :
VcsBaseEditorParameterWidget(parent)
MercurialDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) :
VcsBaseEditorParameterWidget(toolBar)
{
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
settings.boolPointer(MercurialSettings::diffIgnoreWhiteSpaceKey));
@@ -66,7 +66,9 @@ public:
MercurialClient::MercurialClient() : VcsBaseClient(new MercurialSettings)
{
setDiffParameterWidgetCreator([this] { return new MercurialDiffParameterWidget(settings()); });
setDiffParameterWidgetCreator([this](QToolBar *toolBar) {
return new MercurialDiffParameterWidget(settings(), toolBar);
});
}
bool MercurialClient::manifestSync(const QString &repository, const QString &relativeFilename)