forked from qt-creator/qt-creator
QmlDesigner: Remove unused PuppetBuildProgressDialog
Change-Id: Id2e9da8c4fea128105cefe37d3c99ca5537d3acf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -91,11 +91,6 @@ extend_qtc_library(QmlDesignerCore
|
||||
PUBLIC_DEPENDS rt
|
||||
)
|
||||
|
||||
set(UI_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/designercore/instances/puppetbuildprogressdialog.ui
|
||||
)
|
||||
qt_wrap_ui(UI_SOURCES ${UI_FILES})
|
||||
|
||||
extend_qtc_library(QmlDesignerCore
|
||||
INCLUDES ${CMAKE_CURRENT_BINARY_DIR}
|
||||
SOURCES
|
||||
@@ -290,8 +285,6 @@ extend_qtc_library(QmlDesignerCore
|
||||
nodeinstanceserverproxy.cpp
|
||||
nodeinstanceserverproxy.h
|
||||
nodeinstanceview.cpp
|
||||
puppetbuildprogressdialog.cpp
|
||||
puppetbuildprogressdialog.h
|
||||
puppetstartdata.h
|
||||
puppetstarter.cpp
|
||||
puppetstarter.h
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
// Copyright (C) 2016 The Qt Company Ltd.
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
|
||||
#include "puppetbuildprogressdialog.h"
|
||||
#include "ui_puppetbuildprogressdialog.h"
|
||||
|
||||
#include <QtDebug>
|
||||
#include <QApplication>
|
||||
#include <coreplugin/icore.h>
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
PuppetBuildProgressDialog::PuppetBuildProgressDialog() :
|
||||
QDialog(Core::ICore::dialogParent()),
|
||||
ui(new Ui::PuppetBuildProgressDialog),
|
||||
m_lineCount(0),
|
||||
m_useFallbackPuppet(false)
|
||||
{
|
||||
setWindowFlags(Qt::SplashScreen);
|
||||
setWindowModality(Qt::ApplicationModal);
|
||||
ui->setupUi(this);
|
||||
ui->buildProgressBar->setMaximum(85);
|
||||
connect(ui->useFallbackPuppetPushButton, &QAbstractButton::clicked, this, &PuppetBuildProgressDialog::setUseFallbackPuppet);
|
||||
}
|
||||
|
||||
PuppetBuildProgressDialog::~PuppetBuildProgressDialog()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void PuppetBuildProgressDialog::setProgress(int progress)
|
||||
{
|
||||
ui->buildProgressBar->setValue(progress);
|
||||
}
|
||||
|
||||
bool PuppetBuildProgressDialog::useFallbackPuppet() const
|
||||
{
|
||||
return m_useFallbackPuppet;
|
||||
}
|
||||
|
||||
void PuppetBuildProgressDialog::setErrorOutputFile(const QString &filePath)
|
||||
{
|
||||
ui->openErrorOutputFileLabel->setText(QString::fromLatin1("<a href='file:///%1'>%2</a>").arg(
|
||||
filePath, ui->openErrorOutputFileLabel->text()));
|
||||
}
|
||||
|
||||
void PuppetBuildProgressDialog::setErrorMessage(const QString &message)
|
||||
{
|
||||
ui->label->setText(QString::fromLatin1("<font color='red'>%1</font>").arg(message));
|
||||
ui->useFallbackPuppetPushButton->setText(tr("OK"));
|
||||
connect(ui->useFallbackPuppetPushButton, &QAbstractButton::clicked, this, &QDialog::accept);
|
||||
}
|
||||
|
||||
void PuppetBuildProgressDialog::setUseFallbackPuppet()
|
||||
{
|
||||
m_useFallbackPuppet = true;
|
||||
}
|
||||
|
||||
void PuppetBuildProgressDialog::newBuildOutput(const QByteArray &standardOutput)
|
||||
{
|
||||
m_lineCount += standardOutput.count('\n');
|
||||
setProgress(m_lineCount);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
// Copyright (C) 2016 The Qt Company Ltd.
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
namespace Ui {
|
||||
class PuppetBuildProgressDialog;
|
||||
}
|
||||
|
||||
|
||||
class PuppetBuildProgressDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit PuppetBuildProgressDialog();
|
||||
~PuppetBuildProgressDialog() override;
|
||||
|
||||
void setProgress(int progress);
|
||||
void newBuildOutput(const QByteArray &standardOutput);
|
||||
bool useFallbackPuppet() const;
|
||||
void setErrorOutputFile(const QString &filePath);
|
||||
void setErrorMessage(const QString &message);
|
||||
|
||||
private:
|
||||
void setUseFallbackPuppet();
|
||||
|
||||
private:
|
||||
Ui::PuppetBuildProgressDialog *ui;
|
||||
int m_lineCount;
|
||||
bool m_useFallbackPuppet;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>QmlDesigner::PuppetBuildProgressDialog</class>
|
||||
<widget class="QDialog" name="QmlDesigner::PuppetBuildProgressDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>695</width>
|
||||
<height>99</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Build Progress</string>
|
||||
</property>
|
||||
<property name="modal">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Building Adapter for the current Qt. Happens only once for every Qt installation.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QProgressBar" name="buildProgressBar">
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="openErrorOutputFileLabel">
|
||||
<property name="text">
|
||||
<string>Open error output file</string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="useFallbackPuppetPushButton">
|
||||
<property name="text">
|
||||
<string>Use Fallback QML Emulation Layer</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user