FCL/sf/mw/securitysrv: comparison cpsecplugins/cpadvancedsecplugin/src/cpsecurityview.cpp

equal deleted inserted replaced

-:b63e8c2d8cff
+:604cd42065d1
 #include <hbdataform.h>
 #include <hbdataformmodel.h>
 #include <hbdataformmodelitem.h>
 #include <hblabel.h>
 #include <hbpushbutton.h>
-#include <HbMenu.h>
+#include <hbmenu.h>
 #include <hbaction.h>
-#include <HbMessageBox.h>
+#include <hbmessagebox.h>
 #include <HbListWidget>
 #include <HbListWidgetItem>
 #include <HbGroupBox>
 #include <hbpushbutton.h>
 #include <hbmainwindow.h>
 #include <hbabstractviewitem.h>
 #include <HbMessageBox>
 #include <memory>
+#include <../../inc/cpsecplugins.h>
 #include "cpsecurityview.h"
 #include "cpsecmodview.h"
 #include "cpcertview.h"
 #include "cpsecmodmodel.h"
 #include "cpsecmoduleinfoview.h"
 	  mSecModUIModel(NULL),
 	  mSecModView(NULL),
 	  mPreView(NULL),
 	  mCertView(NULL),
 	  mCurrentView(NULL),
-	  mPos(0)
+	  mPos(0),
-	{
+	  mNote(NULL)
+	{
+	RDEBUG("0", 0);
 	setTitle(hbTrId("txt_certificate_manager_setlabel_advanced_security"));
 	std::auto_ptr<QGraphicsLinearLayout> layout(q_check_ptr(new QGraphicsLinearLayout(Qt::Vertical)));
 HbListWidget* listCertView = q_check_ptr(new HbListWidget(this));
 connect(listCertView, SIGNAL(released(QModelIndex)), this, SLOT(displayCert(QModelIndex)));
 HbListWidget* listSecView = q_check_ptr(new HbListWidget(this));
 QMap<QString,QString> keystoreLabels;
+RDEBUG("0", 0);
 try
 		{
 		QT_TRAP_THROWING(
 		mSecModUIModel = CSecModUIModel::NewL();
 		keystoreLabels = mSecModUIModel->LoadTokenLabelsL(); )
 		std::auto_ptr<HbListWidgetItem> emptyWidget(q_check_ptr(new HbListWidgetItem()));
 		emptyWidget->setText("(no security modules)");
 	listSecView->addItem(emptyWidget.get());
 	emptyWidget.release();
 	}
+RDEBUG("0", 0);
 std::auto_ptr<HbGroupBox> certificatesList(q_check_ptr(new HbGroupBox()));
 	certificatesList->setHeading(hbTrId("txt_certificate_manager_setlabel_certificates"));
 	certificatesList->setContentWidget(listCertView);
 	certificatesList->setCollapsed(true);
 	layout->addItem(certificatesList.get());
 	securityModuleList->setContentWidget(listSecView);
 	securityModuleList->setCollapsed(true);
 	layout->addItem(securityModuleList.get());
 	securityModuleList.release();
+	mContextMenu = q_check_ptr(new HbMenu());
 	setLayout(layout.get());
 	layout.release();
 	}
 CpSecurityView::~CpSecurityView()
 	{
 	if(mSecModView)
 		{
 		mSecModView->deleteLater();
-		mSecModView= NULL;
 		}
 	if(mPreView)
 		{
 		mPreView->deleteLater();
-		mPreView= NULL;
 		}
 	if(mCertView)
 		{
 		mCertView->deleteLater();
-		mCertView= NULL;
 		}
 	if(mCurrentView)
 		{
 		mCurrentView->deleteLater();
-		mCurrentView= NULL;
 		}
 	delete mSecModUIModel;
-	mSecModUIModel = NULL;
+	delete mNote;
+	delete mContextMenu;
 	}
 void CpSecurityView::showCodeView()
 	{
+	RDEBUG("0", 0);
 	try
 		{
 		mSecModView = q_check_ptr(new CpSecModView(mPos, *mSecModUIModel));
 		QObject::connect(mSecModView , SIGNAL(aboutToClose()), this, SLOT(viewDone()));
 		mPreView = mainWindow()->currentView();   //suppose mPreView  is member variable of CpSecurityView
 	showCodeView();
 	}
 void CpSecurityView::showWIMview()
 	{
+	RDEBUG("0", 0);
 	try
 		{
 		QObject::connect(mSecModView , SIGNAL(aboutToClose()), this, SLOT(viewDone()));
 		mPreView = mainWindow()->currentView();   //suppose mPreView  is member variable of CpSecurityView
 		mainWindow()->addView(mSecModView);
 		}
 	}
 void CpSecurityView::displayCert(const QModelIndex& modelIndex)
 	{
+	RDEBUG("0", 0);
 	try
 	{
 	mCertView = q_check_ptr(new CpCertView(modelIndex));
 	connect(mCertView , SIGNAL(aboutToClose()), this, SLOT(displayPrevious()));
 	mPreView = mainWindow()->currentView();
 		}
 	}
 void CpSecurityView::displayPrevious()
 	{
+	RDEBUG("0", 0);
 	try
 		{
 		mainWindow()->removeView(mCertView);
 		mCertView->deleteLater();
 		mCertView= NULL;
 		}
 	}
 void CpSecurityView::indicateLongPress(HbAbstractViewItem *item,QPointF coords)
 	{
-	try
+	RDEBUG("0", 0);
-		{
+	try
-		std::auto_ptr<HbMenu> contextMenu(q_check_ptr(new HbMenu()));
+		{
+		mContextMenu->clearActions();
 		mPos = item->modelIndex().row();
 		std::auto_ptr<HbAction> openModule(q_check_ptr(new HbAction("Open")));
 		connect(openModule.get(), SIGNAL(triggered()), this, SLOT( showCodeView()));
-		contextMenu->addAction(openModule.get());
+		mContextMenu->addAction(openModule.get());
 		openModule.release();
 		if(mSecModUIModel->IsTokenDeletable(mPos))
 			{
 			std::auto_ptr<HbAction> deleteModule(q_check_ptr(new HbAction("Delete")));
 			connect(deleteModule.get(), SIGNAL(triggered()), this, SLOT( deleteModule()));
-			contextMenu->addAction(deleteModule.get());
+			mContextMenu->addAction(deleteModule.get());
 			deleteModule.release();
 			}
 		std::auto_ptr<HbAction> moduleInfo(q_check_ptr(new HbAction("Module Info")));
 		connect(moduleInfo.get(), SIGNAL(triggered()), this, SLOT( moduleDetails()));
-		contextMenu->addAction(moduleInfo.get());
+		mContextMenu->addAction(moduleInfo.get());
 		moduleInfo.release();
-		contextMenu->open();
+		mContextMenu->setPreferredPos(coords);
-		contextMenu->setPreferredPos(coords);
+		mContextMenu->open();
 		}
 	catch(const std::exception& exception)
 		{
 		HbMessageBox::information(exception.what());
 		}
 	}
 void CpSecurityView::deleteModule()
 	{
-	try
+	RDEBUG("0", 0);
-		{
+	try
-		HbMessageBox note(HbMessageBox::MessageTypeQuestion);
+		{
-		note.setHeadingWidget(q_check_ptr(new HbLabel(tr("Delete..."))));
-		note.setText("Delete keystore and password?");
+		delete mNote;
-		note.setPrimaryAction(q_check_ptr(new HbAction("Yes")));
+		mNote = NULL;
-		note.setSecondaryAction(q_check_ptr(new HbAction("No")));
-		note.setTimeout(HbPopup::NoTimeout);
+		mNote = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
-		note.setIconVisible (EFalse);
+		mNote->setHeadingWidget(q_check_ptr(new HbLabel(tr("Delete..."))));
-		HbAction* result = note.exec();
+		mNote->setText("Delete keystore and password?");
+		mNote->setPrimaryAction(q_check_ptr(new HbAction("Yes")));
-		if (result != note.primaryAction())
+		mNote->setSecondaryAction(q_check_ptr(new HbAction("No")));
-			{
+		mNote->setTimeout(HbPopup::NoTimeout);
-			return;
+		mNote->setIconVisible (EFalse);
-			}
+		mNote->open(this,SLOT(dialogClosed(HbAction*)));
+		}
+	catch(const std::exception& exception)
+		{
+	    HbMessageBox *box = new HbMessageBox(exception.what());
+	box->setAttribute(Qt::WA_DeleteOnClose);
+	box->open();
+		}
+}
+void CpSecurityView::dialogClosed(HbAction* action)
+{
+	RDEBUG("0", 0);
+	if (action != mNote->primaryAction())
+		{
+		return;
+		}
+	try
+		{
 		QT_TRAP_THROWING(mSecModUIModel->DeleteKeysL(mPos));
 		}
 	catch(const std::exception& exception)
 		{
-		HbMessageBox::information(exception.what());
+	    HbMessageBox *box = new HbMessageBox(exception.what());
-		}
+	box->setAttribute(Qt::WA_DeleteOnClose);
-	// refresh current view
+	box->open();
+		}
 	}
 void CpSecurityView::moduleDetails()
 	{
+	RDEBUG("0", 0);
 	try
 		{
 		QVector< QPair<QString,QString> > securityDetails;
 		QT_TRAP_THROWING(securityDetails = mSecModUIModel->SecModDetailsL(mPos));
 		mModuleinfoView = q_check_ptr(new CpSecmoduleInfoView(securityDetails));
 		}
 	}
 void CpSecurityView::displayPreviousFromModInfo()
 	{
+	RDEBUG("0", 0);
 	try
 		{
 		mainWindow()->removeView(mModuleinfoView);
 		mCertView->deleteLater();
 		mCertView= NULL;

branch	GCC_SURGE
changeset 40	604cd42065d1
parent 37	7bad16cccaca
child 59	881d92421467