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

Python: Be less disrupting with the messages pane

Browse Source 
Only pop it open directly after explicit interaction

Task-number: QTCREATORBUG-24430
Change-Id: I55025a901cb3d694994614bae21204ab9da49fc0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-12-15 12:34:07 +01:00
parent 6ac319b94d
commit 9f8a48b245
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/python/pythonproject.cpp
View File

@@ -302,7 +302,7 @@ bool PythonBuildSystem::saveRawList(const QStringList &rawList, const QString &f
QString errorMessage;
result = writePyProjectFile(fileName, content, rawList, &errorMessage);
if (!errorMessage.isEmpty())
MessageManager::write(errorMessage);
MessageManager::writeDisrupting(errorMessage);
}
}
} else { // Old project file
@@ -404,12 +404,12 @@ void PythonBuildSystem::parse()
QString errorMessage;
m_rawFileList = readLinesJson(filePath, &errorMessage);
if (!errorMessage.isEmpty())
MessageManager::write(errorMessage);
MessageManager::writeFlashing(errorMessage);
errorMessage.clear();
m_rawQmlImportPathList = readImportPathsJson(filePath, &errorMessage);
if (!errorMessage.isEmpty())
MessageManager::write(errorMessage);
MessageManager::writeFlashing(errorMessage);
} else if (filePath.endsWith(".pyqtc")) {
// To keep compatibility with PyQt we keep the compatibility with plain
// text files as project files.

18
src/plugins/python/pythonutils.cpp
View File

@@ -269,8 +269,9 @@ public:
m_process.start(m_python.toString(), arguments);
Core::MessageManager::write(tr("Running \"%1 %2\" to install Python language server")
.arg(m_process.program(), m_process.arguments().join(' ')));
Core::MessageManager::writeDisrupting(
tr("Running \"%1 %2\" to install Python language server")
.arg(m_process.program(), m_process.arguments().join(' ')));
m_killTimer.setSingleShot(true);
m_killTimer.start(5 /*minutes*/ * 60 * 1000);
@@ -280,8 +281,9 @@ private:
void cancel()
{
SynchronousProcess::stopProcess(m_process);
Core::MessageManager::write(tr("The Python language server installation was canceled by %1.")
.arg(m_killTimer.isActive() ? tr("user") : tr("time out")));
Core::MessageManager::writeFlashing(
tr("The Python language server installation was canceled by %1.")
.arg(m_killTimer.isActive() ? tr("user") : tr("time out")));
}
void installFinished(int exitCode, QProcess::ExitStatus exitStatus)
@@ -291,7 +293,7 @@ private:
if (Client *client = registerLanguageServer(m_python))
LanguageClientManager::openDocumentWithClient(m_document, client);
} else {
Core::MessageManager::write(
Core::MessageManager::writeFlashing(
tr("Installing the Python language server failed with exit code %1").arg(exitCode));
}
deleteLater();
@@ -301,14 +303,14 @@ private:
{
const QString &stdOut = QString::fromLocal8Bit(m_process.readAllStandardOutput().trimmed());
if (!stdOut.isEmpty())
Core::MessageManager::write(stdOut);
Core::MessageManager::writeSilently(stdOut);
}
void errorAvailable()
{
const QString &stdErr = QString::fromLocal8Bit(m_process.readAllStandardError().trimmed());
if (!stdErr.isEmpty())
Core::MessageManager::write(stdErr);
Core::MessageManager::writeSilently(stdErr);
}
QFutureInterface<void> m_future;
@@ -523,7 +525,7 @@ void openPythonRepl(const FilePath &file, ReplType type)
&ConsoleProcess::processError,
process,
[process, commandLine](const QString &errorString) {
Core::MessageManager::write(
Core::MessageManager::writeDisrupting(
QCoreApplication::translate("Python",
"Failed to run Python (%1): \"%2\".")
.arg(commandLine, errorString));