mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-01 06:35:41 +08:00
Workaround for multiline placeholder no longer needed
https://discordapp.com/channels/539048679160676382/539925070550794240/576863170006745114
This commit is contained in:
@@ -325,10 +325,6 @@ namespace BlackGui
|
|||||||
const QString simDir = this->getFileBrowserSimulatorDirectory();
|
const QString simDir = this->getFileBrowserSimulatorDirectory();
|
||||||
ui->le_SimulatorDirectory->setPlaceholderText(simDir.isEmpty() ? "Simulator directory" : simDir);
|
ui->le_SimulatorDirectory->setPlaceholderText(simDir.isEmpty() ? "Simulator directory" : simDir);
|
||||||
|
|
||||||
//! \fixme correct version when Qt multiline placeholder is fixed https://bugreports.qt.io/browse/QTBUG-43817
|
|
||||||
// cppcheck-suppress knownConditionTrueFalse
|
|
||||||
constexpr bool BrokenMultilinePlaceholder = true; // last checked with Qt 5.10
|
|
||||||
|
|
||||||
// we take the settings and update to latest sim.directory
|
// we take the settings and update to latest sim.directory
|
||||||
CSpecializedSimulatorSettings settings = m_settings.getSpecializedSettings(simulator);
|
CSpecializedSimulatorSettings settings = m_settings.getSpecializedSettings(simulator);
|
||||||
settings.setSimulatorDirectory(simDir);
|
settings.setSimulatorDirectory(simDir);
|
||||||
@@ -340,17 +336,8 @@ namespace BlackGui
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const QString ms = m.join("<br>");
|
const QString ms = m.join("\n");
|
||||||
// cppcheck-suppress knownConditionTrueFalse
|
ui->pte_ModelDirectories->setPlaceholderText(ms);
|
||||||
if (BrokenMultilinePlaceholder && m.size() > 1)
|
|
||||||
{
|
|
||||||
ui->pte_ModelDirectories->setToolTip(unwrappedTooltip(ms));
|
|
||||||
ui->pte_ModelDirectories->setPlaceholderText("See tooltip for defaults");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui->pte_ModelDirectories->setPlaceholderText(ms);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const QStringList e = settings.getDefaultModelExcludeDirectoryPatterns();
|
const QStringList e = settings.getDefaultModelExcludeDirectoryPatterns();
|
||||||
@@ -360,17 +347,8 @@ namespace BlackGui
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const QString es = e.join("<br>");
|
const QString es = e.join("\n");
|
||||||
if (BrokenMultilinePlaceholder && e.size() > 1)
|
ui->pte_ExcludeDirectories->setPlaceholderText(es);
|
||||||
{
|
|
||||||
//! \fixme correct version when Qt multiline placeholder is fixed https://bugreports.qt.io/browse/QTBUG-43817
|
|
||||||
ui->pte_ExcludeDirectories->setToolTip(unwrappedTooltip(es));
|
|
||||||
ui->pte_ExcludeDirectories->setPlaceholderText("See tooltip for defaults");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ui->pte_ExcludeDirectories->setPlaceholderText(es);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user