Author: tgoettlicher Date: Mon Aug 6 17:32:21 2007 New Revision: 6495 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6495&view=rev Log: Better error handling when loading plugin fails (#297589) Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/UpdaterApplication.cpp Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6495&r1=6494&r2=6495&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Mon Aug 6 17:32:21 2007 @@ -328,6 +328,22 @@ _simple->setState(APPLET_PROBLEM, desc); } +void MainWindow::slotPluginError(const QString &desc) +{ + kdDebug() << "Applet error, description: " << desc << endl; + kdDebug() << "Applet error, description length: " << desc.length() << endl; + applet->setUpdates(0); + applet->setState(APPLET_PROBLEM, desc); + + _simple->setRecommendedCount(0); + _simple->setSecurityCount(0); + _simple->setState(APPLET_PROBLEM, desc); + + _check_updates_action->setEnabled(false); + _edit_sources_action->setEnabled(false); + + configButtonClicked(); +} // todo void MainWindow::slotAppletState(int state, int patches, int packages) { @@ -338,6 +354,9 @@ _simple->setSecurityCount(patchCountSecurity()); _simple->setRestartCount(patchCountRestart()); _simple->setState(state); + + _check_updates_action->setEnabled(true); + _edit_sources_action->setEnabled(true); } void MainWindow::slotSetProgress(int step, int totalSteps, QString text) Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=6495&r1=6494&r2=6495&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Mon Aug 6 17:32:21 2007 @@ -180,6 +180,7 @@ @param desc Description or error messages */ void slotAppletError(const QString &desc); + void slotPluginError(const QString &desc); /** Tells the backend to repopulate our list. Modified: trunk/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/UpdaterApplication.cpp?rev=6495&r1=6494&r2=6495&view=diff ============================================================================== --- trunk/updater-kde/updater/UpdaterApplication.cpp (original) +++ trunk/updater-kde/updater/UpdaterApplication.cpp Mon Aug 6 17:32:21 2007 @@ -45,8 +45,8 @@ setMainWidget(_main); setTopWidget(_main); - connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(slotAppletError(const QString &))); - connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(configButtonClicked())); + connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(slotPluginError(const QString &))); +// connect(this, SIGNAL(pluginError(const QString &)), _main, SLOT(configButtonClicked())); connect(_main, SIGNAL(signalConfigChanged()), this, SLOT(slotConfigChanged())); @@ -108,27 +108,27 @@ switch (errCode) { case KParts::ComponentFactory::ErrNoServiceFound : - kdDebug() << "Unable to load plugin. ErrNoServiceFound" << endl; + emit(pluginError(i18n("Unable to load plugin. ErrNoServiceFound"))); break; case KParts::ComponentFactory::ErrServiceProvidesNoLibrary : - kdDebug() << "Unable to load plugin. ErrServiceProvidesNoLibrary" << endl; + emit(pluginError(i18n("Unable to load plugin. ErrServiceProvidesNoLibrary"))); break; case KParts::ComponentFactory::ErrNoLibrary : - kdDebug() << "Unable to load plugin. ErrNoLibrary: " << KLibLoader::self()->lastErrorMessage() << endl; + emit(pluginError(i18n("Unable to load plugin. ErrNoLibrary: %1").arg(KLibLoader::self()->lastErrorMessage()))); break; case KParts::ComponentFactory::ErrNoFactory : - kdDebug() << "Unable to load plugin. ErrNoFactory" << endl; + emit(pluginError(i18n("Unable to load plugin. ErrNoFactory"))); break; case KParts::ComponentFactory::ErrNoComponent : - kdDebug() << "Unable to load plugin. ErrNoComponent" << endl; + emit(pluginError(i18n("Unable to load plugin. ErrNoComponent"))); break; default: - kdDebug() << "Unable to load plugin. Unknown Error" << errCode << endl; + emit(pluginError(i18n("Unable to load plugin. Unknown Error"))); break; } return false; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org