Changeset 14698 for S60/trunk/S60WebUi

Timestamp:

06/02/06 15:35:48 (3 years ago)

Author:

brmorris

Message:

2006-06-02 Shyam <Shyam.Sareen@nokia.com>

Reviewed by Zalan/Bradley

• S60WebUi\HomePage\src\BookmarkPageGen.cpp
• S60WebUi\HomePage\src\SettingsPageGen.cpp

• Bookmarks & Setting Menu Options not working on hardware due to overzealous WINS flags.

Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=9256

Location:

S60/trunk/S60WebUi/HomePage/src

Files:

• BookmarkPageGen.cpp (modified) (13 diffs)
• SettingsPageGen.cpp (modified) (10 diffs)

S60/trunk/S60WebUi/HomePage/src/BookmarkPageGen.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.
@@ -120 +120 @@
     {
     if (iBookmarkNames)
-        {
-        iBookmarkNames->Reset();
+      {
+      iBookmarkNames->Reset();
         delete iBookmarkNames;
-        }
+      }
 
     if (iBookmarkUrls)
-        {
-        iBookmarkUrls->Reset();
+      {
+      iBookmarkUrls->Reset();
         delete iBookmarkUrls;
-        }
+      }
 
     delete iBookmarkInfo;
 
-        iBookmarkSess.Close();
+  iBookmarkSess.Close();
 
     delete iAHLEClient;
@@ -181 +181 @@
             // Replace the <bookmark> tag with bookmark info in the template
             HBufC8* modifiedStr = FindAndReplaceLoopTagsL( templatePtr,
-                                                                                                   *iBookmarkNames,
-                                                                                                                   *iBookmarkUrls,
-                                                                                                                   *iBookmarkInfo );
+                                       *iBookmarkNames,
+                               *iBookmarkUrls,
+                               *iBookmarkInfo );
             CleanupStack::PushL(modifiedStr);
             cleanupCount++;
@@ -193 +193 @@
         }      
    
-#ifdef __WINS__
     // Save the newly created bokmarkpage html page as a file
     RFile pageFile;
@@ -202 +201 @@
         pageFile.Close();
         }
-#endif // __WINS__
 
     CleanupStack::PopAndDestroy(cleanupCount); // fs, templateFile, templateStr, modifiedStr
@@ -265 +263 @@
             
             if (aBookmarkInfo[i].parent)
-                {
-                ReplaceAll( textPtr, KBrowserParentTag(), KStrTrue );
-                }
+              {
+              ReplaceAll( textPtr, KBrowserParentTag(), KStrTrue );
+              }
             else
-                {
-                ReplaceAll( textPtr, KBrowserParentTag(), KStrFalse );
-                }
+              {
+              ReplaceAll( textPtr, KBrowserParentTag(), KStrFalse );
+              }
             
             ReplaceAll( textPtr, KBrowserNameTag(), aName[ i ] );
@@ -285 +283 @@
             
             if (aBookmarkInfo[i].readOnly)
-                {
-                ReplaceAll( textPtr, KBrowserReadOnlyTag(), KStrTrue );
-                }
+              {
+              ReplaceAll( textPtr, KBrowserReadOnlyTag(), KStrTrue );
+              }
             else
-                {
-                ReplaceAll( textPtr, KBrowserReadOnlyTag(), KStrFalse );
-                }
+              {
+              ReplaceAll( textPtr, KBrowserReadOnlyTag(), KStrFalse );
+              }
 
             }
@@ -317 +315 @@
   
     // Get children (recursive)
-        ReadBookmarkFolderL( KBrowserRootId, KBrowserRootLevel, db );
-
-        CleanupStack::PopAndDestroy(); // db
+    ReadBookmarkFolderL( KBrowserRootId, KBrowserRootLevel, db );
+
+  CleanupStack::PopAndDestroy(); // db
 
     }
@@ -330 +328 @@
 //    
 void CBookmarkPageGen::ReadBookmarkFolderL(TInt aParentUid, TInt aLevel, RFavouritesDb aDb)
-        {
-        CFavouritesItemList* itemList = new( ELeave ) CFavouritesItemList();
-        CleanupStack::PushL( itemList );
-        TInt err = aDb.GetAll( *itemList, aParentUid);
-
-        aLevel++;
-        //for (TInt i = 0; err == KErrNone && i < itemList->Count(); i++) // newest on bottom
-        for (TInt i = itemList->Count() -1; err == KErrNone && i > -1; i--) // newest on top
-                {
-                CFavouritesItem* item = itemList->At( i );
-                
-                // convert from 16 to 8
+  {
+  CFavouritesItemList* itemList = new( ELeave ) CFavouritesItemList();
+  CleanupStack::PushL( itemList );
+  TInt err = aDb.GetAll( *itemList, aParentUid);
+
+  aLevel++;
+  //for (TInt i = 0; err == KErrNone && i < itemList->Count(); i++) // newest on bottom
+  for (TInt i = itemList->Count() -1; err == KErrNone && i > -1; i--) // newest on top
+    {
+    CFavouritesItem* item = itemList->At( i );
+    
+    // convert from 16 to 8
         HBufC8* name8 = HBufC8::NewLC( item->Name().Length() );
         name8->Des().Copy( item->Name() ); 
@@ -347 +345 @@
         HBufC8* url8 = HBufC8::NewLC( item->Url().Length() );
         url8->Des().Copy( item->Url() );
-                        
-                iBookmarkNames->AppendL( name8->Des() );
+            
+    iBookmarkNames->AppendL( name8->Des() );
         iBookmarkUrls->AppendL( url8->Des() );
         
@@ -359 +357 @@
         
         CleanupStack::PopAndDestroy( 2 ); // name8, url8
-                
-                if (item->IsFolder() && item->Uid()> KBrowserRootId)
-                        {                       
-                        ReadBookmarkFolderL(item->Uid(),aLevel,aDb); // recusive!!!
-                        }
-                }
-                CleanupStack::PopAndDestroy(itemList);
-        }
+    
+    if (item->IsFolder() && item->Uid()> KBrowserRootId)
+      {     
+      ReadBookmarkFolderL(item->Uid(),aLevel,aDb); // recusive!!!
+      }
+    }
+    CleanupStack::PopAndDestroy(itemList);
+  }
 // -----------------------------------------------------------------------------
 // CBookmarkPageGen::FindAndReplaceLoopTagsL
@@ -395 +393 @@
             // loopText strips the <bookmark> tags from 
             //    <bookmark>
-                        //    bk[#num#] = new bkRecord(#parent#,"#id#","#name#","#url#",#level#,#readonly#)
-                        //    </bookmark>
+      //    bk[#num#] = new bkRecord(#parent#,"#id#","#name#","#url#",#level#,#readonly#)
+      //    </bookmark>
             TPtrC8 loopText( modifiedText->Mid( pos + KBrowserBookmarkTag().Length(), 
                 endPos - ( pos + KBrowserBookmarkTag().Length() ) ) );

S60/trunk/S60WebUi/HomePage/src/SettingsPageGen.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.
@@ -189 +189 @@
             }
         }
-                
-#ifdef __WINS__
+      
     // Save the newly created settingspage html page as a file
     RFile pageFile;
@@ -199 +198 @@
         pageFile.Close();
         }
-#endif // __WINS__
 
     // Clean up all memory before we return
@@ -217 +215 @@
     {
     HBufC8* resolvedText = NULL;
-        TInt addedLength( 100 );
+  TInt addedLength( 100 );
 
     resolvedText = HBufC8::NewLC( aText.Length() + addedLength );
     TInt pos = aText.Find( KBrowserSettingNameTagEnd );
     if (pos != KErrNotFound)
-        {
-        pos += KBrowserSettingNameTagEnd().Length();
-        }
+      {
+      pos += KBrowserSettingNameTagEnd().Length();
+      }
     else
-        {
-        pos = 0;
-        }
+      {
+      pos = 0;
+      }
     
     resolvedText->Des().Append( aText.Mid(pos) );
@@ -243 +241 @@
     pos = textPtr.Find( KBrowserValueNumTag );
     while( pos != KErrNotFound )
-        {
-            TBuf8<5> vnumStr;
-            iValueNum++;
-            vnumStr.Num( iValueNum );
-            ReplaceOne( textPtr, KBrowserValueNumTag(), vnumStr );
-            pos = textPtr.Find( KBrowserValueNumTag );
-        }
-        
+      {
+      TBuf8<5> vnumStr;
+      iValueNum++;
+      vnumStr.Num( iValueNum );
+      ReplaceOne( textPtr, KBrowserValueNumTag(), vnumStr );
+      pos = textPtr.Find( KBrowserValueNumTag );
+      }
+      
     CleanupStack::Pop(); // resolvedText
     return resolvedText;
@@ -263 +261 @@
 //
 void CSettingsPageGen::ReadSettingsL(TPtr8 aText)
-        {
-        TInt err( KErrNotFound );
+  {
+  TInt err( KErrNotFound );
 
     if ( OpenSettingsDbL() == KErrNone )
@@ -283 +281 @@
             name->Des().Copy( name8 );
   
-                        // Returns KErrTooBig if value too big for descriptor
-                        TBuf<KMaxSettingLength> val;
-                        err = GetSettingAsStringL( *name, val );
+      // Returns KErrTooBig if value too big for descriptor
+      TBuf<KMaxSettingLength> val;
+      err = GetSettingAsStringL( *name, val );
             if ( err == KErrNone )
-                {
-                // Convert to 8-bit
-                        HBufC8* value8 = HBufC8::NewLC( val.Length() );
-                        value8->Des().Copy( val ); 
-                iSettingValues->AppendL( value8->Des() );
-                CleanupStack::PopAndDestroy();// value8
-                }
+              {
+              // Convert to 8-bit
+            HBufC8* value8 = HBufC8::NewLC( val.Length() );
+            value8->Des().Copy( val ); 
+              iSettingValues->AppendL( value8->Des() );
+              CleanupStack::PopAndDestroy();// value8
+              }
             else
-                {
-                iSettingValues->AppendL( KNullDesC8() );
-                }
-                
+              {
+              iSettingValues->AppendL( KNullDesC8() );
+              }
+              
             CleanupStack::PopAndDestroy(); // name
             
@@ -308 +306 @@
     
         CloseSettingsDbL();
-        }
+      }
     }
 
@@ -472 +470 @@
         view->ReadUintL( TPtrC( COMMDB_ID ), apId );
         
-        // Convert AP Name to 8-bit
-                apName8.Copy( apName ); 
+      // Convert AP Name to 8-bit
+    apName8.Copy( apName ); 
         iSettingNames->AppendL( apName8 );