--- a/connectionmonitoring/cellularindicatorplugin/src/cellularindicatorplugin.cpp Thu Jun 10 16:00:16 2010 +0300
+++ b/connectionmonitoring/cellularindicatorplugin/src/cellularindicatorplugin.cpp Thu Jun 24 11:36:05 2010 +0300
@@ -16,7 +16,7 @@
*/
#include <QtPlugin>
-#include <QTranslator>
+#include <HbTranslator>
#include <QLocale>
#include <QList>
#include <HbLabel>
@@ -94,12 +94,7 @@
Q_UNUSED(indicatorType)
// Install localization
- QTranslator *translator = new QTranslator(this);
-
- QString lang = QLocale::system().name();
- QString path = "Z:/resource/qt/translations/";
- translator->load("cellularindicatorplugin_" + lang, path);
- qApp->installTranslator(translator);
+ HbTranslator *translator(new HbTranslator("cellularindicatorplugin"));
OstTraceFunctionExit0( CELLULARINDICATORPLUGIN_CREATEINDICATOR_EXIT );
return this;
@@ -156,15 +151,13 @@
Q_UNUSED(type)
bool handled = false;
+ QVariantMap data;
switch(type) {
case InteractionActivated:
- //connect error() to slot processError() to get error,
- QObject::connect( &process, SIGNAL(error(QProcess::ProcessError)),
- this, SLOT(processError(QProcess::ProcessError)));
+ // Emit a signal that will inform the client to start the connectionview client
+ emit userActivated(data);
- // Show connection view
- process.start("connview");
handled = true;
break;
@@ -228,26 +221,3 @@
return ret;
}
-/*!
- The processError is a handler for error codes.
-*/
-void CellularIndicatorPlugin::processError(QProcess::ProcessError err)
- {
- OstTraceFunctionEntry1(CELLULARINDICATORPLUGIN_PROCESSERROR_ENTRY, this);
-
- switch (err) {
- case QProcess::FailedToStart:
- case QProcess::Crashed:
- case QProcess::Timedout:
- case QProcess::ReadError:
- case QProcess::WriteError:
- case QProcess::UnknownError:
- OstTrace1( CELLULARINDICATORPLUGIN_ERR,PROCESSERROR_KNOWN,"Process Error %u", err);
- break;
- default:
- OstTrace1( CELLULARINDICATORPLUGIN_ERR,PROCESSERROR_UNKNOWN,"Unknown Process Error %u", err);
- break;
- }
- OstTraceFunctionExit1(CELLULARINDICATORPLUGIN_PROCESSERROR_EXIT, this);
- }
-