diff options
author | Tim Jenssen <tim.jenssen@nokia.com> | 2011-12-07 13:05:29 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2011-12-07 13:49:31 +0100 |
commit | f792381dbf18452073cd38e1262f264d81fd8d7f (patch) | |
tree | 08bc9700e773310b1b75347e4bbb4a397695d8c3 /installerbuilder/libinstaller | |
parent | ff136f72247ead559c39b653e8b1d24a7e65beee (diff) |
show all details of all messageboxes in verbose
- and not only for some and then only some information
Change-Id: I9dce3cc895eeff864585db822ba3b8d91233b9d5
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller')
-rw-r--r-- | installerbuilder/libinstaller/messageboxhandler.cpp | 13 | ||||
-rw-r--r-- | installerbuilder/libinstaller/packagemanagercore.cpp | 1 | ||||
-rw-r--r-- | installerbuilder/libinstaller/packagemanagercore_p.cpp | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/installerbuilder/libinstaller/messageboxhandler.cpp b/installerbuilder/libinstaller/messageboxhandler.cpp index 827dec631..0357b7312 100644 --- a/installerbuilder/libinstaller/messageboxhandler.cpp +++ b/installerbuilder/libinstaller/messageboxhandler.cpp @@ -273,6 +273,17 @@ QMessageBox::StandardButton MessageBoxHandler::showMessageBox(MessageType messag const QString &identifier, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton button) const { + static QHash<MessageType, QString> messageTypeHash; + if (messageTypeHash.isEmpty()) { + messageTypeHash.insert(criticalType, QLatin1String("critical")); + messageTypeHash.insert(informationType, QLatin1String("information")); + messageTypeHash.insert(questionType, QLatin1String("question")); + messageTypeHash.insert(warningType, QLatin1String("warning")); + }; + + qDebug() << QString(QLatin1String("created %1 message box %2: '%3', %4")).arg( + messageTypeHash.value(messageType),identifier, title, text); + if (QApplication::type() == QApplication::Tty) return button; @@ -280,8 +291,6 @@ QMessageBox::StandardButton MessageBoxHandler::showMessageBox(MessageType messag return m_automaticAnswers.value(identifier); if (m_defaultAction == AskUser) { - if (!identifier.isEmpty()) - qDebug() << QString(QLatin1String("create message box with identifier: '%1'")).arg(identifier); switch (messageType) { case criticalType: return showNewMessageBox(parent, QMessageBox::Critical, title, text, buttons, button); diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index ecd511d88..dd16e199a 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -403,7 +403,6 @@ void PackageManagerCore::installComponent(Component *component, double progressO } catch (const Error &error) { if (status() != PackageManagerCore::Canceled) { d->setStatus(PackageManagerCore::Failure); - verbose() << "INSTALLER FAILED: " << error.message() << std::endl; MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("installationError"), tr("Error"), error.message()); } diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index 184a9d26a..06dece2cf 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -1439,7 +1439,6 @@ void PackageManagerCorePrivate::runInstaller() } catch (const Error &err) { if (m_core->status() != PackageManagerCore::Canceled) { setStatus(PackageManagerCore::Failure); - verbose() << "INSTALLER FAILED: " << err.message() << std::endl; MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("installationError"), tr("Error"), err.message()); verbose() << "ROLLING BACK operations=" << m_performedOperationsCurrentSession.count() @@ -1604,7 +1603,6 @@ void PackageManagerCorePrivate::runPackageUpdater() } catch (const Error &err) { if (m_core->status() != PackageManagerCore::Canceled) { setStatus(PackageManagerCore::Failure); - verbose() << "INSTALLER FAILED: " << err.message() << std::endl; MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("installationError"), tr("Error"), err.message()); verbose() << "ROLLING BACK operations=" << m_performedOperationsCurrentSession.count() @@ -1697,7 +1695,6 @@ void PackageManagerCorePrivate::runUninstaller() } catch (const Error &err) { if (m_core->status() != PackageManagerCore::Canceled) { setStatus(PackageManagerCore::Failure); - verbose() << "INSTALLER FAILED: " << err.message() << std::endl; MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), QLatin1String("installationError"), tr("Error"), err.message()); } |