diff options
Diffstat (limited to 'src/sdk/installerbasecommons.cpp')
| -rw-r--r-- | src/sdk/installerbasecommons.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index 9c2784b5a..19b76ce7c 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -177,7 +177,7 @@ bool IntroductionPageImpl::validatePage() m_allPackagesFetched = core->fetchRemotePackagesTree(); if (!m_allPackagesFetched) { QString error = core->error(); - if (core->isPackageManager()) { + if (core->isPackageManager() && core->status() != PackageManagerCore::ForceUpdate) { // if that fails and we're in maintenance mode, try to fetch local installed tree localPackagesTreeFetched = core->fetchLocalPackagesTree(); if (localPackagesTreeFetched) { @@ -372,6 +372,7 @@ TargetDirectoryPageImpl::TargetDirectoryPageImpl(PackageManagerCore *core) m_warningLabel = new QLabel(this); m_warningLabel->setPalette(palette); + m_warningLabel->setWordWrap(true); insertWidget(m_warningLabel, QLatin1String("MessageLabel"), 2); } @@ -406,7 +407,7 @@ QString TargetDirectoryPageImpl::targetDirWarning() const dir = dir.mid(2); #endif - QString ambiguousChars = QLatin1String("[<>|?*!@#$%^&:,; ]"); + QString ambiguousChars = QLatin1String("[~<>|?*!@#$%^&:,; ]"); if (packageManagerCore()->settings().allowSpaceInPath()) ambiguousChars.remove(QLatin1Char(' ')); @@ -520,11 +521,6 @@ InstallerGui::InstallerGui(PackageManagerCore *core) setPage(PackageManagerCore::ReadyForInstallation, new ReadyForInstallationPage(core)); setPage(PackageManagerCore::PerformInstallation, new PerformInstallationPage(core)); setPage(PackageManagerCore::InstallationFinished, new FinishedPage(core)); - - bool ok = false; - const int startPage = core->value(QLatin1String("GuiStartPage")).toInt(&ok); - if(ok) - setStartId(startPage); } void InstallerGui::init() |