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

QmlPuppet: enable reset the default puppet button

Browse Source 
Also fix the logic that empty means that it should use the
default fallback puppet.

Task-number: QTCREATORBUG-19511
Change-Id: Ia36907523281386a1ed56362a76e37aaa9ee16b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2018-03-14 14:45:13 +01:00
parent 1f3a106025
commit 710b459e35
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/settingspage.cpp
View File

@@ -36,6 +36,8 @@
#include <qmljseditor/qmljseditorconstants.h> #include <qmljseditor/qmljseditorconstants.h>
#include <qmljstools/qmljstoolsconstants.h> #include <qmljstools/qmljstoolsconstants.h>
#include <utils/qtcassert.h>
#include <QLineEdit> #include <QLineEdit>
#include <QTextStream> #include <QTextStream>
#include <QMessageBox> #include <QMessageBox>
@@ -62,12 +64,14 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
m_ui.designerShowDebuggerCheckBox->setChecked(true); m_ui.designerShowDebuggerCheckBox->setChecked(true);
} }
); );
m_ui.resetFallbackPuppetPathButton->hide();
connect(m_ui.resetFallbackPuppetPathButton, &QPushButton::clicked, [=]() { connect(m_ui.resetFallbackPuppetPathButton, &QPushButton::clicked, [=]() {
m_ui.fallbackPuppetPathLineEdit->setPath( m_ui.fallbackPuppetPathLineEdit->setPath(
PuppetCreator::defaultPuppetFallbackDirectory()); PuppetCreator::defaultPuppetFallbackDirectory());
} }
); );
m_ui.fallbackPuppetPathLineEdit->setPath(PuppetCreator::defaultPuppetFallbackDirectory());
m_ui.fallbackPuppetPathLineEdit->lineEdit()->setPlaceholderText(PuppetCreator::defaultPuppetFallbackDirectory());
connect(m_ui.resetQmlPuppetBuildPathButton, &QPushButton::clicked, [=]() { connect(m_ui.resetQmlPuppetBuildPathButton, &QPushButton::clicked, [=]() {
m_ui.puppetBuildPathLineEdit->setPath( m_ui.puppetBuildPathLineEdit->setPath(
PuppetCreator::defaultPuppetToplevelBuildDirectory()); PuppetCreator::defaultPuppetToplevelBuildDirectory());
@@ -129,10 +133,16 @@ DesignerSettings SettingsPageWidget::settings() const
settings.insert(DesignerSettingsKey::DEBUG_PUPPET, settings.insert(DesignerSettingsKey::DEBUG_PUPPET,
m_ui.debugPuppetComboBox->currentText()); m_ui.debugPuppetComboBox->currentText());
if (!m_ui.fallbackPuppetPathLineEdit->path().isEmpty() && QString newFallbackPuppetPath = m_ui.fallbackPuppetPathLineEdit->path();
m_ui.fallbackPuppetPathLineEdit->path() != PuppetCreator::defaultPuppetFallbackDirectory()) { QTC_CHECK(PuppetCreator::defaultPuppetFallbackDirectory() ==
m_ui.fallbackPuppetPathLineEdit->lineEdit()->placeholderText());
if (newFallbackPuppetPath.isEmpty())
newFallbackPuppetPath = m_ui.fallbackPuppetPathLineEdit->lineEdit()->placeholderText();
QString oldFallbackPuppetPath = settings.value(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY,
PuppetCreator::defaultPuppetFallbackDirectory()).toString();
if (oldFallbackPuppetPath != newFallbackPuppetPath) {
settings.insert(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY, settings.insert(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY,
m_ui.fallbackPuppetPathLineEdit->path()); newFallbackPuppetPath);
} }
if (!m_ui.puppetBuildPathLineEdit->path().isEmpty() && if (!m_ui.puppetBuildPathLineEdit->path().isEmpty() &&