--- a/commondrm/drmqtencryptor/drmencryptor.h Thu Jul 22 14:33:19 2010 +0300
+++ b/commondrm/drmqtencryptor/drmencryptor.h Fri Aug 06 10:04:31 2010 +0300
@@ -60,6 +60,7 @@
void getDRMClock();
void startEncrypt();
void deleteWmDrmDB();
+ void deleteOmaDrmDB();
void launchBrowser();
TUint EncryptL(TUint& aEncryptedCount, TUint& aRightsCount, TUint& aMessagesProcessed);
@@ -74,6 +75,7 @@
QAction *iGetDRMClockAct;
QAction *iEncryptAct;
QAction *iDeleteWMDRMDBAct;
+ QAction *iDeleteOMADRMDBAct;
QAction *iLaunchBrowserAct;
DateTimeDialog *iDateTimeDialog;
--- a/commondrm/drmqtencryptor/drmencyptor.cpp Thu Jul 22 14:33:19 2010 +0300
+++ b/commondrm/drmqtencryptor/drmencyptor.cpp Fri Aug 06 10:04:31 2010 +0300
@@ -83,16 +83,21 @@
iDeleteWMDRMDBAct = new QAction(tr("&Delete WMDRM DB"), this);
iDeleteWMDRMDBAct->setStatusTip(tr("Delete WMDRM Database rights."));
+ iDeleteOMADRMDBAct = new QAction(tr("&Delete OMADRM DB"), this);
+ iDeleteOMADRMDBAct->setStatusTip(tr("Delete OMADRM Database rights."));
+
menuBar()->addAction(iSetDRMClockAct);
menuBar()->addAction(iGetDRMClockAct);
menuBar()->addAction(iEncryptAct);
menuBar()->addAction(iDeleteWMDRMDBAct);
+ menuBar()->addAction(iDeleteOMADRMDBAct);
menuBar()->addAction(iLaunchBrowserAct);
connect(iSetDRMClockAct, SIGNAL(triggered()), this, SLOT(setDRMClock()));
connect(iGetDRMClockAct, SIGNAL(triggered()), this, SLOT(getDRMClock()));
connect(iEncryptAct, SIGNAL(triggered()), this, SLOT(startEncrypt()));
connect(iDeleteWMDRMDBAct, SIGNAL(triggered()), this, SLOT(deleteWmDrmDB()));
+ connect(iDeleteOMADRMDBAct, SIGNAL(triggered()), this, SLOT(deleteOmaDrmDB()));
connect(iLaunchBrowserAct, SIGNAL(triggered()), this, SLOT(launchBrowser()));
//setDRMClockButton = new QPushButton("Set DRM Clock", this);
@@ -609,6 +614,16 @@
}
}
+void DRMEncryptor::deleteOmaDrmDB()
+ {
+ RDRMRightsClient client;
+ User::LeaveIfError(client.Connect());
+ client.DeleteAll();
+ client.Close();
+ }
+
+
+
void DRMEncryptor::launchBrowser()
{
/*_LIT( KTestDrmFile, "c:\\data\\others\\sd_water003.dcf" );
--- a/commondrm/drmqtencryptor/qt_drmencryptor.pro Thu Jul 22 14:33:19 2010 +0300
+++ b/commondrm/drmqtencryptor/qt_drmencryptor.pro Fri Aug 06 10:04:31 2010 +0300
@@ -30,4 +30,4 @@
HEADERS += drmencryptor.h
FORMS += drmencryptor.ui
SOURCES += drmencyptor.cpp main.cpp
-LIBS += -lplatformenv -ldrmserviceapi -ldcfrep -ldrmparsers -lfbscli -lcone -lestor -lcaf -lefsrv
+LIBS += -lplatformenv -ldrmserviceapi -ldcfrep -ldrmparsers -lfbscli -lcone -lestor -lcaf -lefsrv -ldrmserverinterfaces