--- a/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h	Tue Aug 31 16:04:06 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h	Wed Sep 01 12:27:42 2010 +0100
@@ -34,6 +34,13 @@
 */
 class CSCPQueryDialog : public CAknTextQueryDialog, public MAknEcsObserver
 	{
+    public:
+        enum TKeypadContext {
+            ENumeric = 0,
+            EAlphaNumeric,
+            EContextSensitive
+        };
+    
 	public: // Construction and destruction
 	
 		/**
@@ -47,12 +54,14 @@
                          RSCPClient::TSCPButtonConfig aButtonsShown, 
                          TInt aMinLength,
                          TInt aMaxLength,
-                         TBool aECSSupport
+                         TBool aECSSupport,
+                         TKeypadContext aContext = EContextSensitive
                          );
 		/**
         * Destructor.
         */
 		~CSCPQueryDialog();
+		
 	public:
 		/**
 		* Allows dismissing of code queries. Only mandatory requirement is that PIN
@@ -91,6 +100,8 @@
 		
 		void HandleEcsEvent(CAknEcsDetector* aDetector, CAknEcsDetector::TState aUpdatedState);
 		void ShowWarningNoteL();
+		
+		void PostLayoutDynInitL();
 
 	private:
 		
@@ -120,11 +131,13 @@
         TBool                           iPrioritySet;
         TBool                           iPriorityDropped;
         TBool							isCallSoftkeyAdded;
+        TKeypadContext                  iContextSensitive;
         /** An integer variable to define the input mode of the lock code query */
         TInt def_mode;
         TInt iKeyUsed;
         CSCPLockObserver* iDeviceLockStatusObserver;
 		CSCPLockObserver* iCallStatusObserver;
+		TBool iLockedByLawMo;
 	};
 #endif