forked from qt-creator/qt-creator
ExtensionManager: Add Settings button to ExtensionsBrowser
The settings button opens the page where users can allow usage of the remote repository. A change of that setting triggers a refresh of extensions. Change-Id: Ic7269f890b6e5ac3ffdc294203e7ffcaaaace966 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -7,5 +7,6 @@ namespace ExtensionManager::Constants {
|
|||||||
|
|
||||||
const char MODE_EXTENSIONMANAGER[] = "ExtensionManager";
|
const char MODE_EXTENSIONMANAGER[] = "ExtensionManager";
|
||||||
const char C_EXTENSIONMANAGER[] = "ExtensionManager";
|
const char C_EXTENSIONMANAGER[] = "ExtensionManager";
|
||||||
|
const char EXTENSIONMANAGER_SETTINGSPAGE_ID[] = "ExtensionManager.ExtensionManagerSettings";
|
||||||
|
|
||||||
} // ExtensionManager::Constant
|
} // ExtensionManager::Constant
|
||||||
|
@@ -2,6 +2,8 @@
|
|||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
|
|
||||||
#include "extensionmanagersettings.h"
|
#include "extensionmanagersettings.h"
|
||||||
|
|
||||||
|
#include "extensionmanagerconstants.h"
|
||||||
#include "extensionmanagertr.h"
|
#include "extensionmanagertr.h"
|
||||||
|
|
||||||
#include <coreplugin/coreconstants.h>
|
#include <coreplugin/coreconstants.h>
|
||||||
@@ -53,7 +55,7 @@ class ExtensionManagerSettingsPage : public Core::IOptionsPage
|
|||||||
public:
|
public:
|
||||||
ExtensionManagerSettingsPage()
|
ExtensionManagerSettingsPage()
|
||||||
{
|
{
|
||||||
setId("ExtensionManager");
|
setId(Constants::EXTENSIONMANAGER_SETTINGSPAGE_ID);
|
||||||
setDisplayName(Tr::tr("Extensions"));
|
setDisplayName(Tr::tr("Extensions"));
|
||||||
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
|
setCategory(Core::Constants::SETTINGS_CATEGORY_CORE);
|
||||||
setSettingsProvider([] { return &settings(); });
|
setSettingsProvider([] { return &settings(); });
|
||||||
|
@@ -3,9 +3,10 @@
|
|||||||
|
|
||||||
#include "extensionsbrowser.h"
|
#include "extensionsbrowser.h"
|
||||||
|
|
||||||
|
#include "extensionmanagerconstants.h"
|
||||||
|
#include "extensionmanagersettings.h"
|
||||||
#include "extensionmanagertr.h"
|
#include "extensionmanagertr.h"
|
||||||
#include "extensionsmodel.h"
|
#include "extensionsmodel.h"
|
||||||
#include "extensionmanagersettings.h"
|
|
||||||
|
|
||||||
#ifdef WITH_TESTS
|
#ifdef WITH_TESTS
|
||||||
#include "extensionmanager_test.h"
|
#include "extensionmanager_test.h"
|
||||||
@@ -35,6 +36,7 @@
|
|||||||
#include <utils/layoutbuilder.h>
|
#include <utils/layoutbuilder.h>
|
||||||
#include <utils/networkaccessmanager.h>
|
#include <utils/networkaccessmanager.h>
|
||||||
#include <utils/stylehelper.h>
|
#include <utils/stylehelper.h>
|
||||||
|
#include <utils/utilsicons.h>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QItemDelegate>
|
#include <QItemDelegate>
|
||||||
@@ -43,6 +45,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPainterPath>
|
#include <QPainterPath>
|
||||||
|
#include <QPushButton>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
|
|
||||||
using namespace Core;
|
using namespace Core;
|
||||||
@@ -521,6 +524,10 @@ ExtensionsBrowser::ExtensionsBrowser(ExtensionsModel *model, QWidget *parent)
|
|||||||
d->sortChooser->addItems(Utils::transform(SortFilterProxyModel::sortOptions(),
|
d->sortChooser->addItems(Utils::transform(SortFilterProxyModel::sortOptions(),
|
||||||
&SortFilterProxyModel::SortOption::displayName));
|
&SortFilterProxyModel::SortOption::displayName));
|
||||||
|
|
||||||
|
auto settingsToolButton = new QPushButton;
|
||||||
|
settingsToolButton->setIcon(Icons::SETTINGS.icon());
|
||||||
|
settingsToolButton->setFlat(true);
|
||||||
|
|
||||||
d->extensionsView = new QListView;
|
d->extensionsView = new QListView;
|
||||||
d->extensionsView->setFrameStyle(QFrame::NoFrame);
|
d->extensionsView->setFrameStyle(QFrame::NoFrame);
|
||||||
d->extensionsView->setItemDelegate(new ExtensionItemDelegate(this));
|
d->extensionsView->setItemDelegate(new ExtensionItemDelegate(this));
|
||||||
@@ -547,6 +554,7 @@ ExtensionsBrowser::ExtensionsBrowser(ExtensionsModel *model, QWidget *parent)
|
|||||||
Space(HGapS),
|
Space(HGapS),
|
||||||
d->sortChooser,
|
d->sortChooser,
|
||||||
st,
|
st,
|
||||||
|
settingsToolButton,
|
||||||
customMargins(0, 0, extraListViewWidth() + gapSize, 0),
|
customMargins(0, 0, extraListViewWidth() + gapSize, 0),
|
||||||
},
|
},
|
||||||
d->extensionsView,
|
d->extensionsView,
|
||||||
@@ -580,6 +588,13 @@ ExtensionsBrowser::ExtensionsBrowser(ExtensionsModel *model, QWidget *parent)
|
|||||||
d->sortFilterProxyModel, &SortFilterProxyModel::setSortOption);
|
d->sortFilterProxyModel, &SortFilterProxyModel::setSortOption);
|
||||||
connect(d->filterChooser, &OptionChooser::currentIndexChanged,
|
connect(d->filterChooser, &OptionChooser::currentIndexChanged,
|
||||||
d->sortFilterProxyModel, &SortFilterProxyModel::setFilterOption);
|
d->sortFilterProxyModel, &SortFilterProxyModel::setFilterOption);
|
||||||
|
connect(settingsToolButton, &QAbstractButton::pressed, this, []() {
|
||||||
|
ICore::showOptionsDialog(Constants::EXTENSIONMANAGER_SETTINGSPAGE_ID);
|
||||||
|
});
|
||||||
|
connect(&settings(), &AspectContainer::changed, this, [this]() {
|
||||||
|
d->dataFetched = false;
|
||||||
|
fetchExtensions();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
ExtensionsBrowser::~ExtensionsBrowser()
|
ExtensionsBrowser::~ExtensionsBrowser()
|
||||||
|
Reference in New Issue
Block a user