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

Rename one of the DashboardWidgets

Browse Source 
This is confusing on and even led to crashes on macOS.

Change-Id: I4227a091f2b2ac90405494a1a8b206c4ea672030
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2023-01-12 09:45:41 +01:00
parent f994d27bf5
commit 6221871b2f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/axivion/axivionsettingspage.cpp
View File

@@ -46,7 +46,7 @@ static bool isUrlValid(const QString &in)
return hostValid(url.host()) && url.scheme() == "https" || url.scheme() == "http"; return hostValid(url.host()) && url.scheme() == "https" || url.scheme() == "http";
} }
DashboardWidget::DashboardWidget(Mode mode, QWidget *parent) DashboardSettingsWidget::DashboardSettingsWidget(Mode mode, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, m_mode(mode) , m_mode(mode)
{ {
@@ -91,7 +91,7 @@ DashboardWidget::DashboardWidget(Mode mode, QWidget *parent)
} }
} }
AxivionServer DashboardWidget::dashboardServer() const AxivionServer DashboardSettingsWidget::dashboardServer() const
{ {
AxivionServer result; AxivionServer result;
if (m_id.isValid()) if (m_id.isValid())
@@ -104,7 +104,7 @@ AxivionServer DashboardWidget::dashboardServer() const
return result; return result;
} }
void DashboardWidget::setDashboardServer(const AxivionServer &server) void DashboardSettingsWidget::setDashboardServer(const AxivionServer &server)
{ {
m_id = server.id; m_id = server.id;
m_dashboardUrl.setValue(server.dashboard); m_dashboardUrl.setValue(server.dashboard);
@@ -112,7 +112,7 @@ void DashboardWidget::setDashboardServer(const AxivionServer &server)
m_token.setValue(server.token); m_token.setValue(server.token);
} }
bool DashboardWidget::isValid() const bool DashboardSettingsWidget::isValid() const
{ {
return !m_token.value().isEmpty() && !m_description.value().isEmpty() return !m_token.value().isEmpty() && !m_description.value().isEmpty()
&& isUrlValid(m_dashboardUrl.value()); && isUrlValid(m_dashboardUrl.value());
@@ -130,7 +130,7 @@ private:
AxivionSettings *m_settings; AxivionSettings *m_settings;
Utils::StringAspect m_curlPC; Utils::StringAspect m_curlPC;
DashboardWidget *m_dashboardDisplay = nullptr; DashboardSettingsWidget *m_dashboardDisplay = nullptr;
QPushButton *m_edit = nullptr; QPushButton *m_edit = nullptr;
}; };
@@ -139,7 +139,7 @@ AxivionSettingsWidget::AxivionSettingsWidget(AxivionSettings *settings)
{ {
using namespace Layouting; using namespace Layouting;
m_dashboardDisplay = new DashboardWidget(DashboardWidget::Display, this); m_dashboardDisplay = new DashboardSettingsWidget(DashboardSettingsWidget::Display, this);
m_dashboardDisplay->setDashboardServer(m_settings->server); m_dashboardDisplay->setDashboardServer(m_settings->server);
m_edit = new QPushButton(Tr::tr("Edit..."), this); m_edit = new QPushButton(Tr::tr("Edit..."), this);
m_curlPC.setLabelText(Tr::tr("curl:")); m_curlPC.setLabelText(Tr::tr("curl:"));
@@ -170,7 +170,7 @@ void AxivionSettingsWidget::showEditServerDialog()
QDialog d; QDialog d;
d.setWindowTitle(Tr::tr("Edit Dashboard Configuration")); d.setWindowTitle(Tr::tr("Edit Dashboard Configuration"));
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
DashboardWidget *dashboardWidget = new DashboardWidget(DashboardWidget::Edit, this); DashboardSettingsWidget *dashboardWidget = new DashboardSettingsWidget(DashboardSettingsWidget::Edit, this);
dashboardWidget->setDashboardServer(old); dashboardWidget->setDashboardServer(old);
layout->addWidget(dashboardWidget); layout->addWidget(dashboardWidget);
auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, this); auto buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, this);
@@ -178,7 +178,7 @@ void AxivionSettingsWidget::showEditServerDialog()
ok->setEnabled(m_dashboardDisplay->isValid()); ok->setEnabled(m_dashboardDisplay->isValid());
connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject);
connect(ok, &QPushButton::clicked, &d, &QDialog::accept); connect(ok, &QPushButton::clicked, &d, &QDialog::accept);
connect(dashboardWidget, &DashboardWidget::validChanged, connect(dashboardWidget, &DashboardSettingsWidget::validChanged,
ok, &QPushButton::setEnabled); ok, &QPushButton::setEnabled);
layout->addWidget(buttons); layout->addWidget(buttons);
d.setLayout(layout); d.setLayout(layout);

4
plugins/axivion/axivionsettingspage.h
View File

@@ -16,12 +16,12 @@ class AxivionServer;
class AxivionSettings; class AxivionSettings;
class AxivionSettingsWidget; class AxivionSettingsWidget;
class DashboardWidget : public QWidget class DashboardSettingsWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
enum Mode { Display, Edit }; enum Mode { Display, Edit };
explicit DashboardWidget(Mode m = Display, QWidget *parent = nullptr); explicit DashboardSettingsWidget(Mode m = Display, QWidget *parent = nullptr);
AxivionServer dashboardServer() const; AxivionServer dashboardServer() const;
void setDashboardServer(const AxivionServer &server); void setDashboardServer(const AxivionServer &server);