--- a/browsercore/appfw/Api/Managers/BookmarksManager.h	Fri May 14 15:40:36 2010 +0300
+++ b/browsercore/appfw/Api/Managers/BookmarksManager.h	Wed Jun 23 17:59:43 2010 +0300
@@ -1,92 +1,107 @@
 /*
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
 *
 */
 
-
 #ifndef BOOKMARKS_MANAGER_H
 #define BOOKMARKS_MANAGER_H
 
 #include <QtGui/QIcon>
 #include <QObject>
+#include <QAction>
 #include "BWFGlobal.h"
 #include "bedrockprovisioning.h"
 
 int MainImport();
 
 namespace WRT {
-	  int startNativeBookmarksParsing();
+int startNativeBookmarksParsing();
+
+class BookmarksManagerPrivate;
+class BookmarkNode;
+class HistoryModel;
+
+class BWF_EXPORT BookmarksManager : public QObject {
   
-    class BookmarksManagerPrivate;
-    class BookmarkNode;
-    class HistoryModel;
-
-    class BWF_EXPORT BookmarksManager : public QObject
-    {
-		enum EBookmarkManagerErrorTypes
+  Q_OBJECT
+  
+  enum EBookmarkManagerErrorTypes
          {
           ErrNone,
-		  //Add bookmark failure
-		  ErrGeneral = -1,
+      //Add bookmark failure
+      ErrGeneral = -1,
           ErrBookmarkAllReadyPresent =-2,
-		  ErrBookmarkUrlEmpty   = -3,
+      ErrBookmarkUrlEmpty   = -3,
           
           };
 
-        Q_OBJECT
-    public:
-        BookmarksManager(QWidget *parent = 0);
-        ~BookmarksManager();
+  public:
+    BookmarksManager(QWidget *parent = 0);
+    ~BookmarksManager();
 
-        void setSettings(BEDROCK_PROVISIONING::BedrockProvisioning *settings);
-        //Gets ref count of the page from history
-        int getPageRank(const QString &url);
-        
-        static BookmarksManager* getSingleton();
-        
-    
-    signals:
-        
+    void setSettings(BEDROCK_PROVISIONING::BedrockProvisioning *settings);
+    //Gets ref count of the page from history
+    int getPageRank(const QString &url);
+    static BookmarksManager* getSingleton();
+
+  signals:
+    void bookmarkEntryAdded(QString,QString);
+    void launchBookmarkEditDailog(QString,QString);
+    void bookmarkEntryModified(QString, QString);
+    void historyCleared();
+    void confirmHistoryClear();
+
     public slots:
-		
-        void importNativeBookmarks();
-		//javascript APIS
-		QString getBookmarksJSON();
-		int addBookmark(const QString &url, const QString &title,int index=0);
-		void deleteBookmark(QString title);
-		int reorderBokmarks(QString title,int new_index);		
-        
-        QString getHistoryFoldersJSON();
-        QString getHistoryFolderJSON(QString folder);
-        void addHistory(const QString &url, const QString &title);
-        void addHistory(const QUrl &url, const QString &title);
-        void clearHistory();
-        
-    private:
-        //For loading the history from data base
-        void loadHistory();
-        void loadHistoryProxy();
-        //Finds the folder to which the date belongs
-        QString findFolderForDate( QDate& date) const;
-        //add the node to history proxy
-        void addToHistoryProxy(QString &strFoldername, BookmarkNode*node);
-        //add the history item to root node specified
-        bool dateInThisMonth(QDate &date)const;
+
+    void importNativeBookmarks();
+    //javascript APIS
+    QString getBookmarksJSON();
+    int addBookmark(const QString &title,const QString &url,int index=0);
+    void deleteBookmark(QString title);
+    int reorderBokmarks(QString title,int new_index);
+    int modifyBookmark(QString orgTitle, QString newTitle, QString newUrl);
+    void clearBookmarks();
+    void launchEditBookmark(QString title,QString url);
+
+    QString getHistoryFoldersJSON(QString folder="");
+    void addHistory(const QString &url, const QString &title);
+    void addHistory(const QUrl &url, const QString &title);
+    void clearHistory();
+
+    QAction * getActionClearHistory();
 
-    private:
-        BookmarksManagerPrivate * const d;
-    };
+  private:
+    //For loading the history from data base
+    void loadHistory();
+    void loadHistoryProxy();
+    //Finds the folder to which the date belongs
+    QString findFolderForDate( QDate& date) const;
+    //add the node to history proxy
+    void addToHistoryProxy(QString &strFoldername, BookmarkNode*node);
+    //add the history item to root node specified
+    bool dateInThisMonth(QDate &date)const;
+
+  private:
+     BookmarksManagerPrivate * const d;
+     bool m_isBookmarkDbreadRequired;
+     QString m_bookmakrData;
+     
+};
 }
 #endif //BOOKMARKS_MANAGER