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

Copilot: Move AuthWidget update to the class itself

Browse Source 
Change-Id: Iab23566c6d74760eab732fdbad2d9eac645faaff
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-14 16:36:07 +02:00
parent 17267bb15c
commit 3bfd60b708
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/copilot/authwidget.cpp
View File

@@ -4,6 +4,7 @@
#include "authwidget.h" #include "authwidget.h"
#include "copilotclient.h" #include "copilotclient.h"
#include "copilotsettings.h"
#include "copilottr.h" #include "copilottr.h"
#include <utils/layoutbuilder.h> #include <utils/layoutbuilder.h>
@@ -16,6 +17,7 @@
using namespace LanguageClient; using namespace LanguageClient;
using namespace Copilot::Internal; using namespace Copilot::Internal;
using namespace Utils;
namespace Copilot { namespace Copilot {
@@ -26,7 +28,7 @@ AuthWidget::AuthWidget(QWidget *parent)
m_button = new QPushButton(Tr::tr("Sign In")); m_button = new QPushButton(Tr::tr("Sign In"));
m_button->setEnabled(false); m_button->setEnabled(false);
m_progressIndicator = new Utils::ProgressIndicator(Utils::ProgressIndicatorSize::Small); m_progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Small);
m_progressIndicator->setVisible(false); m_progressIndicator->setVisible(false);
m_statusLabel = new QLabel(); m_statusLabel = new QLabel();
m_statusLabel->setVisible(false); m_statusLabel->setVisible(false);
@@ -48,6 +50,16 @@ AuthWidget::AuthWidget(QWidget *parent)
else if (m_status == Status::SignedOut) else if (m_status == Status::SignedOut)
signIn(); signIn();
}); });
auto update = [this] {
updateClient(FilePath::fromUserInput(settings().nodeJsPath.volatileValue()),
FilePath::fromUserInput(settings().distPath.volatileValue()));
};
connect(settings().nodeJsPath.pathChooser(), &PathChooser::textChanged, this, update);
connect(settings().distPath.pathChooser(), &PathChooser::textChanged, this, update);
update();
} }
AuthWidget::~AuthWidget() AuthWidget::~AuthWidget()
@@ -89,7 +101,7 @@ void AuthWidget::checkStatus()
}); });
} }
void AuthWidget::updateClient(const Utils::FilePath &nodeJs, const Utils::FilePath &agent) void AuthWidget::updateClient(const FilePath &nodeJs, const FilePath &agent)
{ {
LanguageClientManager::shutdownClient(m_client); LanguageClientManager::shutdownClient(m_client);
m_client = nullptr; m_client = nullptr;

16
src/plugins/copilot/copilotsettings.cpp
View File

@@ -189,22 +189,6 @@ public:
}.attachTo(this); }.attachTo(this);
// clang-format on // clang-format on
auto updateAuthWidget = [authWidget]() {
authWidget->updateClient(
FilePath::fromUserInput(settings().nodeJsPath.volatileValue()),
FilePath::fromUserInput(settings().distPath.volatileValue()));
};
connect(settings().nodeJsPath.pathChooser(),
&PathChooser::textChanged,
authWidget,
updateAuthWidget);
connect(settings().distPath.pathChooser(),
&PathChooser::textChanged,
authWidget,
updateAuthWidget);
updateAuthWidget();
setOnApply([] { setOnApply([] {
settings().apply(); settings().apply();
settings().writeSettings(); settings().writeSettings();