Changeset 14645 for S60/trunk/S60WebUi

Timestamp:

05/31/06 09:51:09 (3 years ago)

Author:

brmorris

Message:

2006-05-30 Zalan <zbujtas@gmail.com>

Second commit, Reviewed by Bradley/David

• S60WebUi/WebUi/src/WebUiLoadObserver.cpp:
• S60WebUi/WebUi/src/WebUiWindowContainer.cpp:

• S60WebUi/WebUi/src/WebUiLoadObserver.cpp: unable to cancel page load Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=9135

Location:

S60/trunk/S60WebUi/WebUi/src

Files:

• WebUiLoadObserver.cpp (modified) (4 diffs)
• WebUiWindowContainer.cpp (modified) (14 diffs)

S60/trunk/S60WebUi/WebUi/src/WebUiLoadObserver.cpp

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -161 +161 @@
         case TBrCtlDefs::EEventNewContentDisplayed:
             {
-            // Update cba
-            iWindowManager->View()->SwitchCbaL( R_AVKON_SOFTKEYS_OPTIONS_BACK );
             break;
             }
@@ -218 +216 @@
                     cleanupCount++;
                     }
-                                if (url->Find( _L("file://") ) == KErrNotFound )
-                                        {
-                                        iAhle->NewAccessL( *url, *title );
-                                        }
+        if (url->Find( _L("file://") ) == KErrNotFound )
+          {
+          iAhle->NewAccessL( *url, *title );
+          }
                 }
             CleanupStack::PopAndDestroy( cleanupCount ); // url, title

S60/trunk/S60WebUi/WebUi/src/WebUiWindowContainer.cpp

@@ -10 +10 @@
 *    All rights reserved.
 *
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *
 *    Please see file patentlicense.txt for further grants.
@@ -426 +426 @@
             break;
             }
+        case ECmdLoadCancel:
+        {
+            Engine()->HandleCommandL( iCommandBase + TBrCtlDefs::ECommandCancelFetch );
+            break;
+        }
         case ECmdGoToCancel:
         case ECmdGoTo:
-            {
-            GoToL(aCommand);
-            break;
+          {
+          GoToL(aCommand);
+          break;
             }
         case ECmdInputCancel:
@@ -440 +445 @@
         case ECmdHome:
             {
-                        // Load home page
+      // Load home page
             LoadLocalPageByTypeL( EHomePage );
             break;
@@ -471 +476 @@
             {
             Engine()->ClearCache();
-                        TDesC* prompt = StringLoader::LoadLC( R_BROWSER_CLEAR_CACHE );
-                        InfoNoteL(*prompt);
-                        CleanupStack::PopAndDestroy(); // prompt
+      TDesC* prompt = StringLoader::LoadLC( R_BROWSER_CLEAR_CACHE );
+      InfoNoteL(*prompt);
+      CleanupStack::PopAndDestroy(); // prompt
             break;
             }
@@ -505 +510 @@
             break;
             }
-                case ECmdZoomIn:
-                {
-                iView->ZoomInL();
-                break;
-                }
-                case ECmdZoomOut:
-                {
-                iView->ZoomOutL();
-                break;
-                }
-                case ECmdLoadImages:
-                {
-                        Engine()->HandleCommandL( TBrCtlDefs::ECommandLoadImages +
+    case ECmdZoomIn:
+        {
+        iView->ZoomInL();
+        break;
+        }
+        case ECmdZoomOut:
+        {
+        iView->ZoomOutL();
+        break;
+        }
+    case ECmdLoadImages:
+        {
+      Engine()->HandleCommandL( TBrCtlDefs::ECommandLoadImages +
                                       TBrCtlDefs::ECommandIdBase );
-                        break;
-                }
-                case ECmdShowOverview:
-                {
-                        // Not supported in engine part
-                        // ShowOverview();
-                        break;
-                }
-                case ECmdPageInfo:
-                        {
-                        CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
-                        session->ShowPageInfoL();
-                        delete session;
-                        break;
-                        }
-                case ECmdSaveAsBookmark:
-                {
-                        SaveAsBookmarkL();
-                        break;
-                }
+      break;
+        }
+    case ECmdShowOverview:
+        {
+      // Not supported in engine part
+      // ShowOverview();
+      break;
+        }
+    case ECmdPageInfo:
+      {
+      CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
+      session->ShowPageInfoL();
+      delete session;
+      break;
+      }
+    case ECmdSaveAsBookmark:
+        {
+      SaveAsBookmarkL();
+      break;
+        }
         case EWmlCmdInfoSession:
             {
-                        CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
+      CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
             session->ShowSessionInfoL();
             delete session;
@@ -547 +552 @@
             }
         case EWmlCmdInfoSecurity:
-                    {
-                        CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
-                        session->ShowSecurityInfoL();
-                        delete session;
-                        break;
+        {
+      CWebUiSessionAndSecurity* session = CWebUiSessionAndSecurity::NewL( *iConnection, *Engine() );
+      session->ShowSecurityInfoL();
+      delete session;
+      break;
             }
         default:
@@ -640 +645 @@
 
     // Does local page name end in "page", ie "bookmarkpage", "settingpage",
-        // or "homepage". Local page table items always end in "page".
-        // For example: "brui://bookmarkpage" or "brui://settingpage"
+    // or "homepage". Local page table items always end in "page".
+  // For example: "brui://bookmarkpage" or "brui://settingpage"
     if ( aLocalPageName.Right(4) == KPage() )
         {
@@ -719 +724 @@
     if( iFindOn )
         {
-                TInt findResponse = TBrCtlDefs::EFindNoMatches;
+    TInt findResponse = TBrCtlDefs::EFindNoMatches;
         //
         switch( aCommand )
@@ -752 +757 @@
                 }
             }
-                HBufC* toolTipText = NULL;
-
-                        switch ( findResponse )
-                                {
-                                case TBrCtlDefs::EFindNoMatches:
-                                        toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_NO_MATCHES );
-                                        break;
-                                case TBrCtlDefs::EFindWrapAround:
-                                        toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_WRAPAROUND );
-                                        break;
-                                case TBrCtlDefs::EFindAllMatches:
-                                        toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_ALL_CONTENT_SEARCHED );
-                                        break;
-                                }
-
-                        // Show the result of the search.
-                        if ( toolTipText )
-                        {
-                    iWindowManager->ActiveWindow()->DialogsProvider().ShowTooltipL( *toolTipText );
-                        CleanupStack::PopAndDestroy( toolTipText );
-                        }
+            HBufC* toolTipText = NULL;
+
+      switch ( findResponse )
+        {
+        case TBrCtlDefs::EFindNoMatches:
+          toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_NO_MATCHES );
+          break;
+        case TBrCtlDefs::EFindWrapAround:
+          toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_WRAPAROUND );
+          break;
+        case TBrCtlDefs::EFindAllMatches:
+          toolTipText = StringLoader::LoadLC( R_QTN_BR_KEYWORD_FIND_ALL_CONTENT_SEARCHED );
+          break;
+        }
+
+      // Show the result of the search.
+      if ( toolTipText )
+      {
+        iWindowManager->ActiveWindow()->DialogsProvider().ShowTooltipL( *toolTipText );
+      CleanupStack::PopAndDestroy( toolTipText );
+      }
 
         }
@@ -935 +940 @@
 
     TInt colonPos = url->Locate( ':' );
-        if ( colonPos <= 0 )
-                {
-                // It should not happen since this char was found in DocumentHandler already
-                User::Leave( KErrArgument );
-                }
+  if ( colonPos <= 0 )
+    {
+    // It should not happen since this char was found in DocumentHandler already
+    User::Leave( KErrArgument );
+    }
 
     HBufC* scheme = HBufC::NewLC( colonPos );
@@ -1010 +1015 @@
     TInt err( KErrNone );
 
-        // Are we loading a local page, ie load "bookmarkpage" or "helppage"...
-        // The load page requests always end with "page".
+  // Are we loading a local page, ie load "bookmarkpage" or "helppage"...
+  // The load page requests always end with "page".
     err = LoadLocalPageByNameL( aAction );
     if ( err == KErrNone || err == KErrCancel )
@@ -1470 +1475 @@
 
     // If there was an error, inform the user
-        TDesC* prompt = NULL;
-        if ( err == KErrNone )
-        {
-                prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_SAVED );
-                InfoNoteL( *prompt );
-        }
-        else
-    {
-            switch ( err )
-            {
-                case KBookmarkNameUsed:
-                        {
-                                prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_NAME_ALREADY_USED );
-                                break;
-                        }
-                case KEmptyBookmarkName:
-                        {
-                                prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_EMPTY_NAME );
-                                break;
-                        }
-                case KEmptyBookmarkUrl:
-                        {
-                                prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_EMPTY_URL );
-                                break;
-                        }
-                        default:
-                        {
-                                // Some unknown error
-                                prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_SAVED_FAILURE );
-                                break;
-                        }
-            }   // end of swtich
-                ErrorNoteL( *prompt );
-    }
-        CleanupStack::PopAndDestroy(); // aPrompt
+  TDesC* prompt = NULL;
+  if ( err == KErrNone )
+  {
+    prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_SAVED );
+    InfoNoteL( *prompt );
+  }
+  else
+    {
+      switch ( err )
+      {
+        case KBookmarkNameUsed:
+      {
+        prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_NAME_ALREADY_USED );
+        break;
+      }
+        case KEmptyBookmarkName:
+      {
+        prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_EMPTY_NAME );
+        break;
+      }
+        case KEmptyBookmarkUrl:
+      {
+        prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_EMPTY_URL );
+        break;
+      }
+      default:
+      {
+        // Some unknown error
+        prompt = StringLoader::LoadLC( R_BROWSER_BOOKMARKS_SAVED_FAILURE );
+        break;
+      }
+      } // end of swtich
+    ErrorNoteL( *prompt );
+    }
+  CleanupStack::PopAndDestroy(); // aPrompt
 
     return err;
@@ -1645 +1650 @@
     {
     // Get the title
-        TInt p( 0 );
-        HBufC* url = Engine()->PageInfoLC( TBrCtlDefs::EPageInfoUrl );
-        p++;
-        HBufC* urlNormal = NormalizeUrlEncodedStringL( *url );
-        CleanupStack::PushL( urlNormal );
-        p++;
-        HBufC* header = StringLoader::LoadLC( R_ENTER_BOOKMARK_NAME );
-        p++;
+  TInt p( 0 );
+  HBufC* url = Engine()->PageInfoLC( TBrCtlDefs::EPageInfoUrl );
+  p++;
+  HBufC* urlNormal = NormalizeUrlEncodedStringL( *url );
+  CleanupStack::PushL( urlNormal );
+  p++;
+  HBufC* header = StringLoader::LoadLC( R_ENTER_BOOKMARK_NAME );
+  p++;
 
     // Get the title
-        HBufC* nameNormal = NULL;
-        if ( url )
-            {
+  HBufC* nameNormal = NULL;
+  if ( url )
+      {
         HBufC* prompt = StringLoader::LoadLC( R_ENTER_BOOKMARK_NAME );
-                p++;//prompt
-                TBuf<KWebUiMaxPrompt+1> retString;
-
-                TPtrC msg( prompt->Des() );
-                CAknTextQueryDialog* dialog = new( ELeave )CAknTextQueryDialog( retString, msg );
-
-                dialog->ExecuteLD( R_BROWSER_PROMPT_LINES );
-                HBufC* nameValue = retString.Left(KFavouritesMaxName).AllocLC();
-                p++;
-                nameNormal = NormalizeUrlEncodedStringL( *nameValue );
-                CleanupStack::PushL( nameNormal );
-                p++;
-
-                AddBookmarkToDbL( *nameNormal, *urlNormal, KRootDir );
-            }
-
-        CleanupStack::PopAndDestroy( p );
+    p++;//prompt
+    TBuf<KWebUiMaxPrompt+1> retString;
+
+    TPtrC msg( prompt->Des() );
+    CAknTextQueryDialog* dialog = new( ELeave )CAknTextQueryDialog( retString, msg );
+
+    dialog->ExecuteLD( R_BROWSER_PROMPT_LINES );
+    HBufC* nameValue = retString.Left(KFavouritesMaxName).AllocLC();
+    p++;
+    nameNormal = NormalizeUrlEncodedStringL( *nameValue );
+    CleanupStack::PushL( nameNormal );
+    p++;
+
+    AddBookmarkToDbL( *nameNormal, *urlNormal, KRootDir );
+      }
+
+  CleanupStack::PopAndDestroy( p );
     }