diff -r 0f2326c2a325 -r 1c3b8676e58c ginebra2/BookmarksToolbarSnippet.cpp --- a/ginebra2/BookmarksToolbarSnippet.cpp Wed Jun 23 17:59:43 2010 +0300 +++ b/ginebra2/BookmarksToolbarSnippet.cpp Tue Jul 06 14:03:49 2010 +0300 @@ -22,6 +22,7 @@ */ #include "BookmarksToolbarSnippet.h" +#include "ToolbarChromeItem.h" #include "ViewStack.h" #include "GWebContentView.h" #include "BookmarksManager.h" @@ -30,8 +31,8 @@ namespace GVA { BookmarksToolbarSnippet::BookmarksToolbarSnippet(const QString& elementId, ChromeWidget * chrome, - const QRectF& ownerArea, const QWebElement & element, QGraphicsWidget * widget) - : DualButtonToolbarSnippet(elementId, chrome, ownerArea, element, widget), + const QWebElement & element) + : DualButtonToolbarSnippet(elementId, chrome, element), m_action1(0), m_action2(0) { } @@ -43,7 +44,14 @@ if(m_action2) delete m_action2; } - + + BookmarksToolbarSnippet * BookmarksToolbarSnippet::instance(const QString& elementId, ChromeWidget * chrome, const QWebElement & element) + { + BookmarksToolbarSnippet * that = new BookmarksToolbarSnippet( elementId, chrome, element ); + that->setChromeWidget( new ToolbarChromeItem( that ) ); + return that; + } + void BookmarksToolbarSnippet::addChild(ChromeSnippet * child) { WebChromeContainerSnippet * s = dynamic_cast(child); if (!s) { @@ -51,16 +59,16 @@ if (child->elementId() == "BookmarksBackButton" ) { t->actionId = BOOKMARKS_VIEW_ACTION_BACK; t->actionName = BOOKMARKS_TOOLBAR_BACK; - t->activeImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_back.png"; + t->normalImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_back.png"; t->disabledImg = ""; - t->selectedImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_back_pressed.png"; + t->activeImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_back_pressed.png"; } else if (child->elementId() == "BookmarksAddButton" ) { t->actionId = BOOKMARKS_VIEW_ACTION_ADD; t->actionName = BOOKMARKS_TOOLBAR_ADD; - t->activeImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_add.png"; + t->normalImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_add.png"; t->disabledImg = ""; - t->selectedImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_add_pressed.png"; + t->activeImg = ":/chrome/bedrockchrome/toolbar.snippet/icons/icon_add_pressed.png"; } t->id = child->elementId(); m_actionInfo.append(t);