getTitle()); - history.append("\", \"dateVal\": \""); - history.append(rootChildren.at(i)->getDate().toString("dd.MM.yyyy")); - history.append("\", \"urlVal\": \""); - history.append(nodeChildren.at(j)->getUrl()); - history.append("\", \"timeVal\": \""); - QString time =nodeChildren.at(j)->getLastVisited().toString("h:mm ap"); - history.append(time); - - if(j != (nodeChildren.count()-1)) - history.append("\"},"); - else - history.append("\"}"); - } - }//EOF for (int j=0; j < nodeChildren.count(); j++) + } + } + if (flag) + { + d->m_actionClearHistory->setEnabled(false); + } + historyFolders.append("]"); + m_folderVector.clear(); + } + if (folderName == "") + { + return historyFolders; - }//EOF IF if (rootChildren.at(i)->type() == BookmarkNode::Folder && rootChildren.at(i)->title() == folder) { - else { - //at this level there cann't be URL items. } - - + else + { + return m_historyMap[folderName]; + } } - history.append ("]"); - - return history; -} /*! * Add the node to the folder in proxy model. If the folder doesnt exist in proxy, create * the folder and add the node to it */ -void BookmarksManager::addToHistoryProxy(QString &strFoldername, BookmarkNode*node) -{ - bool bFound = false; - BookmarkNode *folderNode= NULL; - - //Check if the folder exist with name $strFoldername - for (int i = d->m_historyRootNodeProxy->children().count() - 1; i >= 0; --i) { - folderNode = d->m_historyRootNodeProxy->children()[i]; - QString title = folderNode->title ; - if(folderNode->title == strFoldername){ - //folder exist - bFound = true; - break; - } - } - - if(!bFound){ - //Folder doesnt exist. create new folder with name $strFoldername - folderNode = new BookmarkNode(BookmarkNode::Folder, d->m_historyRootNodeProxy); - folderNode->title = strFoldername; - folderNode->date = node->date; - - int index=0; - //Find the index to where the folder needs to be inserted - for (; index < d->m_historyRootNodeProxy->children().count(); index++) { - BookmarkNode* tmpNode = d->m_historyRootNodeProxy->children()[index]; - if(folderNode->date > tmpNode->date){ - break; - } - } - d->m_historyRootNodeProxy->add(folderNode,index); - } - - - - BookmarkNode *newNode = new BookmarkNode(BookmarkNode::Bookmark,folderNode); - newNode->date = node->date; - newNode->title = node->title; - newNode->lastVisited = node->lastVisited; - newNode->favicon = node->favicon; - newNode->url = node->url; - - //Find the index to where the node needs to be inserted in to the foder - int index=0; - for (; index < folderNode->children().count() ; index++) { - BookmarkNode* tmpNode = folderNode->children()[index]; - if(newNode->lastVisited > tmpNode->lastVisited){ - break; - } - } - - folderNode->add(newNode,index); -} - - -/*! - * Finds the folder to which the date belongs - * - */ -//QString BookmarksManager::findFolderForDate( BookmarkNode *aNode) -QString BookmarksManager::findFolderForDate( QDate& nodeDate)const -{ - QDateTime currentDateTime = QDateTime::currentDateTime(); - int currentDayOfWeek = currentDateTime.date().dayOfWeek(); - - int nodeDayOfWeek = nodeDate.dayOfWeek(); - - int daysToCurrentDate = nodeDate.daysTo(currentDateTime.date()); - - //Check if date to belongs to "ToDay" Folder - if(nodeDate == currentDateTime.date()){ - QString folder = qtTrId("txt_browser_history_today"); - return folder; - } - //Check if date to belongs to "YesterDay" Folder - if(nodeDate.addDays(1) == currentDateTime.date() ){ - QString folder = qtTrId("txt_browser_history_yesterday"); - return folder; - } - - //Check if date to belongs to current week folder - //Should disply the day for the current week - if(daysToCurrentDate < 7 && currentDayOfWeek > nodeDayOfWeek ){ - - QString folder = qtTrId("txt_browser_history_this_week"); - return folder; - } - - if(dateInThisMonth(nodeDate)){ - QString folder = qtTrId("txt_browser_history_this_month"); - return folder; - } - - QString folder = nodeDate.toString("dd.MM.yyyy"); - return folder; - -} - - - -bool BookmarksManager::dateInThisMonth(QDate &date)const -{ - QDate currentDate = QDateTime::currentDateTime().date(); - int daysToCurrentDate = currentDate.daysTo(date); - - int currentMonth = currentDate.month(); - int nodeMonth = date.month(); - - if(daysToCurrentDate <= 31 && currentMonth == nodeMonth) { - return true; - } - return false; - -} - /*! * Add to recent urls @@ -531,13 +382,15 @@ */ Q_DECL_EXPORT void BookmarksManager::addHistory(const QString &url, const QString &title) { - if (!d->m_loadedHistory) - loadHistory(); //Check for a valid history entry if (url.isEmpty() || title.isEmpty()) return; + bool enabled = (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("SaveHistory"); + if(!enabled) + return; + QDateTime currentDateTime = QDateTime::currentDateTime(); HistoryLeaf* leaf=new HistoryLeaf(); @@ -547,11 +400,11 @@ leaf->setLastVisited(currentDateTime.time()); if (d->m_connectedToBookmarks){ - if(ErrNone == d->m_bookmarkSession->AddHistory(leaf)){ - d->m_loadedHistory = false; + if(ErrNone == d->m_bookmarkSession->addHistory(leaf)){ + d->m_actionClearHistory->setEnabled(true); } } - delete leaf; + delete leaf; } /*! @@ -566,43 +419,45 @@ addHistory(url.toString(), title); } + /*! * delete recent urls * clears all the recent url list. */ void BookmarksManager::clearHistory() { - if (!d->m_loadedHistory) - loadHistory(); - //Undo Redo is not required for history(recent urls) - for (int i = d->m_historyRootNode->children().count() - 1; i >= 0; --i) { - BookmarkNode *node = d->m_historyRootNode->children()[i]; - d->m_historyRootNode->remove(node); - } - if (d->m_connectedToBookmarks) { d->m_bookmarkSession->clearHistory(); } - d->m_loadedHistory = false; + + d->m_actionClearHistory->setEnabled(false); + + emit historyCleared(); +} + +QAction * BookmarksManager::getActionClearHistory() +{ + return d->m_actionClearHistory; } int BookmarksManager::getPageRank(const QString &url) { - if (!d->m_loadedHistory) - loadHistory(); - - //Check for a valid entry + //Check for a valid entry if (url.isNull()) return 0; int rank = 0; - QList<BookmarkNode *> rootChildren (d->m_historyRootNode->children()); + QList<HistoryLeaf*> historyNodes = d->m_bookmarkSession->fetchHistory(); - for (int i=0; i < rootChildren.count(); i++) { - //Update rank if there is a history for this URL. - if (!rootChildren[i]->getUrl().compare(url)) - rank++; - } + for (int i=0; i < historyNodes.count(); i++) { + //Update rank if there is a history for this URL. + if (!historyNodes[i]->getUrl().compare(url)) + rank++; + } + + while (!historyNodes.isEmpty()) + delete historyNodes.takeFirst(); + return rank; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/BookmarksManager.h --- a/browsercore/appfw/Api/Managers/BookmarksManager.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/BookmarksManager.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,92 +1,103 @@ /* * 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(); - + void setSettings(BEDROCK_PROVISIONING::BedrockProvisioning *settings); + //Gets ref count of the page from history + int getPageRank(const QString &url); + static BookmarksManager* getSingleton(); - signals: - + signals: + void bookmarkEntryAdded(QString,QString); + void launchBookmarkEditDailog(QString,QString); + void bookmarkEntryModified(QString, QString); + void historyCleared(); + void confirmHistoryClear(); + void bookmarksCleared(); + 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); - private: - BookmarksManagerPrivate * const d; - }; + 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: + //For loading the history from data base + QString normalizeUrl(const QString &url); + + private: + BookmarksManagerPrivate * const d; + bool m_isBookmarkDbreadRequired; + QString m_bookmakrData; + QVector<QString> m_folderVector; + QMap<QString, QString> m_historyMap; + +}; } #endif //BOOKMARKS_MANAGER diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/BookmarksManager_p.h --- a/browsercore/appfw/Api/Managers/BookmarksManager_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/BookmarksManager_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,27 +1,32 @@ /* * 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_P_H #define BOOKMARKS_MANAGER_P_H #include <QtGui/QUndoStack> #include <browsercontentdll.h> -class QSortFilterProxyModel; +#include <QAction> + +class ActionJSObject; namespace WRT { class BookmarksManager; @@ -39,21 +44,14 @@ //! flag to indicate was able to connect to book marks bool m_connectedToBookmarks; //! flag to indicate bookmarks are loaded from data base - bool m_loadedBookmarks; - //! flag to indicate history is loaded from data base - bool m_loadedHistory; - //! Root node for bookmark - BookmarkNode *m_bookmarkRootNode; // owned - //! Root node for history - BookmarkNode *m_historyRootNode; // owned - - //! Root node for history proxy model - BookmarkNode *m_historyRootNodeProxy; // owned int m_maxUrls; BrowserContent* m_bookmarkSession; //flag to indicate importing bookmarks bool m_import; - + + QAction * m_actionClearHistory; + QObject* m_actionsParent; + ActionJSObject *m_actionClearJSO; }; } #endif //BOOKMARKS_MANAGER_P_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/ContentAgent.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/ContentAgent.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,133 @@ +/** + This file is part of CWRT package ** + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** + + 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. 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/>. +*/ + + + +#include <QtCore/QDebug> +#include <QString> +#include "ContentAgent_p.h" +#include "ContentAgent.h" +#include "bookmarks.h" +#include <browsercontentdll.h> + + +namespace WRT { + +ContentAgentPrivate::ContentAgentPrivate(ContentAgent* mgr, QWidget* /*parent*/) : + q(mgr), + m_connectedToBookmarks(false), + m_loadedBookmarks(false), + m_loadedHistory(false), + m_maxUrls(10) +{ + QFileInfo dbFile("browserContent.db"); + + m_bookmarkSession=new BrowserContent("Bedrock"); + if (m_bookmarkSession) { + m_connectedToBookmarks = true; + } else { + qDebug() << "ContentAgentPrivate: Failed to connect to bookmarks"; + } +} + +ContentAgentPrivate::~ContentAgentPrivate() +{ + delete m_bookmarkSession; +} + +/*! + * \class ContentAgent + * + * This class is responsible for managing bookmarks, This class could be used + * mainly for displying bookmarks in UI. + * + */ + +/*! + * Basic constructor + * @param parent : parent widget (Defaulted to NULL ) if not specified + */ +ContentAgent::ContentAgent(QWidget *parent) : + d(new ContentAgentPrivate(this, parent)) +{ + +} + +ContentAgent::~ContentAgent() +{ + delete d; +} + +ContentAgent* ContentAgent::getSingleton() +{ + static ContentAgent* singleton = 0; + + if(!singleton){ + singleton = new ContentAgent(); + singleton->setObjectName("ContentAgent"); + } + return singleton; +} + +QString ContentAgent::getBookmarks() +{ + QList<BookmarkLeaf*> nodes; + nodes = d->m_bookmarkSession->fetchAllBookmarks(); + QString bookmarkData = "["; + for(int i=0;i<nodes.count();i++) { + bookmarkData.append("{"); + bookmarkData.append("\"title\": \""); + bookmarkData.append(nodes[i]->getTitle()); + bookmarkData.append("\", \"urlvalue\": \""); + bookmarkData.append(nodes[i]->getUrl()); + if(i != (nodes.count()-1)) + bookmarkData.append("\"},"); + else + bookmarkData.append("\"}"); + } + bookmarkData.append("]"); + + return bookmarkData; +} + +QMap<QString, QString> ContentAgent::getSuggestedBookmarks(QString atitle) +{ + QList<BookmarkLeaf*> nodes; + nodes = d->m_bookmarkSession->suggestBookMarks(atitle); + QMap<QString, QString> map; + for(int i=0;i<nodes.count();i++) { + map.insert( nodes[i]->getTitle(), nodes[i]->getUrl() ); + } + return map; +} + +QMap<QString, QString> ContentAgent::getSuggestedHistory(QString atitle) +{ + QList<HistoryLeaf*> nodes; + nodes = d->m_bookmarkSession->suggestHistory(atitle); + QMap<QString, QString> map; + for(int i=0;i<nodes.count();i++) { + map.insert( nodes[i]->getTitle(), nodes[i]->getUrl() ); + } + return map; +} + +QObjectList ContentAgent::getUISuggestion(QString suggest) +{ + return (d->m_bookmarkSession->suggestContent(suggest)); +} + +}//wrt diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/ContentAgent.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/ContentAgent.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,53 @@ +/** + This file is part of CWRT package ** + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** + + 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. 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/>. +*/ + +#ifndef CONTENT_AGENT_H +#define CONTENT_AGENT_H + +#include <QObject> +#include <QMap> + +namespace WRT { + + class ContentAgentPrivate; + class BookmarkNode; + class HistoryModel; + + +class ContentAgent : public QObject +{ + Q_OBJECT + + public: + ContentAgent(QWidget *parent = 0); + ~ContentAgent(); + static ContentAgent* getSingleton(); + + public slots: + //javascript APIS + QString getBookmarks(); + QMap<QString, QString> getSuggestedBookmarks(QString atitle); + QMap<QString, QString> getSuggestedHistory(QString atitle); + QObjectList getUISuggestion(QString suggest); + + private: + ContentAgentPrivate* const d; + // list of URL suggestions from history and bookmarks + QObjectList combinedList; +}; +}//wrt + +#endif //CONTENT_AGENT_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/ContentAgent_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/ContentAgent_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,44 @@ +/** + This file is part of CWRT package ** + + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** + + 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. 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/>. +*/ + +#ifndef CONTENT_AGENT_P_H +#define CONTENT_AGENT_P_H + +#include <browsercontentdll.h> + +namespace WRT { + class ContentAgent; + class ContentAgentPrivate + { + public: + ContentAgentPrivate(ContentAgent * qq, QWidget *parent = 0); + ~ContentAgentPrivate(); + + public: // public actions available for this manager + + public: + ContentAgent* const q; + //! flag to indicate was able to connect to book marks + bool m_connectedToBookmarks; + //! flag to indicate bookmarks are loaded from data base + bool m_loadedBookmarks; + //! flag to indicate history is loaded from data base + bool m_loadedHistory; + int m_maxUrls; + BrowserContent* m_bookmarkSession; + }; +} +#endif //CONTENT_AGENT_P_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/LoadController.cpp --- a/browsercore/appfw/Api/Managers/LoadController.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/LoadController.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,23 +1,28 @@ /* * 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: * */ - #include "LoadController.h" +#include "webpagecontroller.h" +#include "wrtbrowsercontainer.h" #include <QDebug> namespace WRT { @@ -67,6 +72,12 @@ m_gotoMode = GotoModeReloadable; + // FIXME it is a temp fix for the url change issued with cached pages + if (ok) { + WebPageController * pageController = WebPageController::getSingleton(); + if (pageController->currentPage()->loadController() == this) + m_textBoxValue = pageController->currentDocUrl(); + } // TODO: Change to editing mode if load failed /* // if page succeed, set the text and goto reloading mode, else load mode @@ -81,6 +92,8 @@ } */ emit pageLoadFinished(ok); + if (!ok) + emit pageLoadFailed(); //qDebug() << __PRETTY_FUNCTION__ << m_gotoMode ; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/LoadController.h --- a/browsercore/appfw/Api/Managers/LoadController.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/LoadController.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 LoadController_h #define LoadController_h @@ -74,6 +77,7 @@ Q_SIGNALS: void pageLoadStarted(); + void pageLoadFailed(); void pageLoadProgress(const int); void pageLoadFinished(const bool ok); void pageUrlChanged(QString); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/Managers.pri --- a/browsercore/appfw/Api/Managers/Managers.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/Managers.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,23 +1,26 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # HEADERS += \ $$PWD/BookmarksManager_p.h \ $$PWD/BookmarksManager.h \ - $$PWD/WrtPageManager.h \ $$PWD/secureuicontroller_p.h \ $$PWD/secureuicontroller.h \ $$PWD/LoadController.h \ @@ -25,7 +28,13 @@ $$PWD/webpagecontroller.h \ $$PWD/webpagecontroller_p.h \ $$PWD/downloadcontroller_p.h \ - $$PWD/downloadcontroller.h + $$PWD/downloadcontroller.h \ + $$PWD/downloadproxy_p.h \ + $$PWD/downloadproxy.h \ + $$PWD/contentagent_p.h \ + $$PWD/contentagent.h \ + $$PWD/lowmemoryhandler.h \ + $$PWD/lowmemoryhandler_p.h SOURCES += \ $$PWD/BookmarksManager.cpp \ @@ -33,4 +42,17 @@ $$PWD/LoadController.cpp \ $$PWD/viewcontroller.cpp \ $$PWD/webpagecontroller.cpp \ - $$PWD/downloadcontroller.cpp + $$PWD/downloadcontroller.cpp \ + $$PWD/downloadproxy.cpp \ + $$PWD/downloadproxydata.cpp \ + $$PWD/contentagent.cpp \ + $$PWD/lowmemoryhandler.cpp + +symbian: { +SOURCES += \ + $$PWD/lowmemoryhandler_p_s60.cpp +} +!symbian: { +SOURCES += \ + $$PWD/lowmemoryhandler_p.cpp +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/WrtPageManager.h --- a/browsercore/appfw/Api/Managers/WrtPageManager.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -// Do not use WrtPageManager!!! -// Use WebPageController - -#include "webpagecontroller.h" - -namespace WRT { - class BWF_EXPORT WrtPageManager : public WebPageController - { - Q_OBJECT; - public: - WrtPageManager(QObject* parent = 0) : WebPageController(parent) {} - static WrtPageManager* getSingleton() { return static_cast<WrtPageManager*>(WebPageController::getSingleton()); } - }; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadcontroller.cpp --- a/browsercore/appfw/Api/Managers/downloadcontroller.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/downloadcontroller.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,24 +1,30 @@ /* * Copyright (c) 2010 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: * */ - #include "downloadcontroller.h" #include "downloadcontroller_p.h" +#include "downloadproxy_p.h" + +#include <QFileInfo> #include <QNetworkProxy> #include <QNetworkReply> #include <QNetworkRequest> @@ -80,7 +86,7 @@ case QNetworkReply::ProtocolFailure: return "QNetworkReply::ProtocolFailure"; default: - return 0; + return "???"; } } @@ -126,293 +132,6 @@ } } -static const char * downloadPriorityToString(DownloadPriority priority) -{ - switch (priority) { - case High: - return "High"; - case Low: - return "Low"; - default: - return 0; - } -} - -static const char * downloadScopeToString(DownloadScope scope) -{ - switch (scope) { - case Normal: - return "Normal"; - case Background: - return "Background"; - default: - return 0; - } -} - -static const char * downloadStateToString(DownloadState state) -{ - switch (state) { - case DlNone: - return "DlNone"; - case DlCreated: - return "DlCreated"; - case DlStarted: - return "DlStarted"; - case DlInprogress: - return "DlInprogress"; - case DlPaused: - return "DlPaused"; - case DlCompleted: - return "DlCompleted"; - case DlFailed: - return "DlFailed"; - case DlCancelled: - return "DlCancelled"; - case DlDescriptorUpdated: - return "DlDescriptorUpdated"; - default: - return 0; - } -} - -static const char * downloadTypeToString(DownloadType type) -{ - switch (type) { - case Parallel: - return "Parallel"; - case Sequential: - return "Sequential"; - default: - return 0; - } -} - -static void debugDownloadStr( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - QString value = download->getAttribute(attribute).toString(); - if (value.length() == 0) { - return; - } - - qDebug() << "DL" << download->id() << name << value; -} - -static void debugDownloadInt( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int value = download->getAttribute(attribute).toInt(); - if (value == 0) { - return; - } - - qDebug() << "DL" << download->id() << name << value; -} - -static void debugDownloadUInt( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - uint value = download->getAttribute(attribute).toUInt(); - if (value == 0) { - return; - } - - qDebug() << "DL" << download->id() << name << value; -} - -static void debugDownloadError( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int num = download->getAttribute(attribute).toInt(); - - const char * str = downloadErrorToString(static_cast<QNetworkReply::NetworkError>(num)); - if (str == 0) { - str = "???"; - } - - qDebug() << "DL" << download->id() << name << num << str; -} - -static void debugDownloadPriority( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int num = download->getAttribute(attribute).toInt(); - - const char * str = downloadPriorityToString(static_cast<DownloadPriority>(num)); - if (str == 0) { - str = "???"; - } - - qDebug() << "DL" << download->id() << name << num << str; -} - -static void debugDownloadScope( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int num = download->getAttribute(attribute).toInt(); - - const char * str = downloadScopeToString(static_cast<DownloadScope>(num)); - if (str == 0) { - str = "???"; - } - - qDebug() << "DL" << download->id() << name << num << str; -} - -static void debugDownloadState( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int num = download->getAttribute(attribute).toInt(); - - const char * str = downloadStateToString(static_cast<DownloadState>(num)); - if (str == 0) { - str = "???"; - } - - qDebug() << "DL" << download->id() << name << num << str; -} - -static void debugDownloadType( - Download * download, - DownloadAttribute attribute, - const char * name) -{ - int num = download->getAttribute(attribute).toInt(); - - const char * str = downloadTypeToString(static_cast<DownloadType>(num)); - if (str == 0) { - str = "???"; - } - - qDebug() << "DL" << download->id() << name << num << str; -} - -void DownloadController::debugDownload(Download * download) -{ - debugDownloadState(download, - DlDownloadState, - "DlDownloadState"); - - debugDownloadError(download, - DlLastError, - "DlLastError"); - - debugDownloadStr(download, - DlLastErrorString, - "DlLastErrorString"); - - debugDownloadStr(download, - DlSourceUrl, - "DlSourceUrl"); - - debugDownloadStr(download, - DlContentType, - "DlContentType"); - - debugDownloadStr(download, - DlDestPath, - "DlDestPath"); - - debugDownloadStr(download, - DlFileName, - "DlFileName"); - - debugDownloadInt(download, - DlDownloadedSize, - "DlDownloadedSize"); - - debugDownloadInt(download, - DlTotalSize, - "DlTotalSize"); - - debugDownloadInt(download, - DlLastPausedSize, - "DlLastPausedSize"); - - debugDownloadInt(download, - DlPercentage, - "DlPercentage"); - - debugDownloadStr(download, - DlStartTime, - "DlStartTime"); - - debugDownloadStr(download, - DlEndTime, - "DlEndTime"); - - debugDownloadUInt(download, - DlElapsedTime, - "DlElapsedTime"); - - debugDownloadStr(download, - DlRemainingTime, - "DlRemainingTime"); - - debugDownloadStr(download, - DlSpeed, - "DlSpeed"); - - debugDownloadScope(download, - DlDownloadScope, - "DlDownloadScope"); - - debugDownloadType(download, - DlDownloadType, - "DlDownloadType"); - - debugDownloadPriority(download, - DlPriority, - "DlPriority"); - - debugDownloadInt(download, - DlProgressInterval, - "DlProgressInterval"); - - debugDownloadStr(download, - OMADownloadDescriptorName, - "OMADownloadDescriptorName"); - - debugDownloadStr(download, - OMADownloadDescriptorVersion, - "OMADownloadDescriptorVersion"); - - debugDownloadStr(download, - OMADownloadDescriptorType, - "OMADownloadDescriptorType"); - - debugDownloadStr(download, - OMADownloadDescriptorSize, - "OMADownloadDescriptorSize"); - - debugDownloadStr(download, - OMADownloadDescriptorVendor, - "OMADownloadDescriptorVendor"); - - debugDownloadStr(download, - OMADownloadDescriptorDescription, - "OMADownloadDescriptorDescription"); - - debugDownloadStr(download, - OMADownloadDescriptorNextURL, - "OMADownloadDescriptorNextURL"); -} - static void debugDownloadEvent(DEventType type) { const char * name = downloadEventToString(type); @@ -475,6 +194,16 @@ return QString(); } +void DownloadControllerPrivate::startDownload(const QUrl & url, const QFileInfo & info) +{ + Download * download = m_downloadManager->createDownload(url.toString()); + + download->setAttribute(DlDestPath, info.absolutePath()); + download->setAttribute(DlFileName, info.fileName()); + + startDownload(download, url); +} + void DownloadControllerPrivate::startDownload(QNetworkReply * reply) { QUrl url = reply->url(); @@ -508,9 +237,12 @@ // Start download. - emit m_downloadController->downloadCreated(download); + DownloadProxy downloadProxy(new DownloadProxyData(download)); + + emit m_downloadController->downloadCreated(downloadProxy); download->registerEventReceiver(this); + download->start(); } @@ -526,6 +258,9 @@ return true; case DownloadsCleared: + // ;;; In new DL mgr will have DownloadManager 'Removed' event instead. + // ;;; Looks like this will only be generated when all downloads are removed. + // ;;; In that case we can emit the same signal. emit m_downloadController->downloadsCleared(); return true; @@ -564,34 +299,36 @@ if (errorStr != 0) error = errorStr; + DownloadProxy downloadProxy(new DownloadProxyData(download)); + switch (type) { case Started: - emit m_downloadController->downloadStarted(download); + emit m_downloadController->downloadStarted(downloadProxy); return true; case HeaderReceived: - emit m_downloadController->downloadHeaderReceived(download); + emit m_downloadController->downloadHeaderReceived(downloadProxy); return true; case Progress: - emit m_downloadController->downloadProgress(download); + emit m_downloadController->downloadProgress(downloadProxy); return true; case Completed: - emit m_downloadController->downloadFinished(download); + emit m_downloadController->downloadFinished(downloadProxy); return true; case Paused: - emit m_downloadController->downloadPaused(download, error); + emit m_downloadController->downloadPaused(downloadProxy, error); return true; case Cancelled: - emit m_downloadController->downloadCancelled(download, error); + emit m_downloadController->downloadCancelled(downloadProxy, error); return true; case Failed: - emit m_downloadController->downloadFailed(download, error); + emit m_downloadController->downloadFailed(downloadProxy, error); return true; case DescriptorUpdated: @@ -599,11 +336,11 @@ return true; case NetworkLoss: - emit m_downloadController->downloadNetworkLoss(download, error); + emit m_downloadController->downloadNetworkLoss(downloadProxy, error); return true; case Error: - emit m_downloadController->downloadError(download, error); + emit m_downloadController->downloadError(downloadProxy, error); return true; case OMADownloadDescriptorReady: @@ -671,24 +408,11 @@ delete d; } -bool DownloadController::handlePage(QWebPage * page) +void DownloadController::startDownload(const QUrl & url, const QFileInfo & info) { - bool succeeded = true; + qDebug() << "Download URL" << url; - // Handle click on link when the link type is not supported. - page->setForwardUnsupportedContent(true); - if (!connect(page, SIGNAL(unsupportedContent(QNetworkReply *)), - this, SLOT(startDownload(QNetworkReply *)))) { - succeeded = false; - }; - - // Handle Save Link and Save Image requests from the context menu. - if (!connect(page, SIGNAL(downloadRequested(const QNetworkRequest &)), - this, SLOT(startDownload(const QNetworkRequest &)))) { - succeeded = false; - } - - return succeeded; + d->startDownload(url, info); } void DownloadController::startDownload(QNetworkReply * reply) @@ -721,15 +445,46 @@ DownloadController::~DownloadController() {} -bool DownloadController::handlePage(QWebPage * page) +void DownloadController::startDownload(const QUrl & url, const QFileInfo & info) { - return true; + Q_UNUSED(info) + + emit unsupportedDownload(url); } void DownloadController::startDownload(QNetworkReply * reply) -{} +{ + QUrl url = reply->url(); + + emit unsupportedDownload(url); +} void DownloadController::startDownload(const QNetworkRequest & request) -{} +{ + QUrl url = request.url(); + + emit unsupportedDownload(url); +} #endif // USE_DOWNLOAD_MANAGER + +bool DownloadController::handlePage(QWebPage * page) +{ + bool succeeded = true; + + // Handle click on link when the link type is not supported. + page->setForwardUnsupportedContent(true); + if (!connect(page, SIGNAL(unsupportedContent(QNetworkReply *)), + this, SLOT(startDownload(QNetworkReply *)))) { + succeeded = false; + }; + + // Handle Save Link and Save Image requests from the context menu. + if (!connect(page, SIGNAL(downloadRequested(const QNetworkRequest &)), + this, SLOT(startDownload(const QNetworkRequest &)))) { + succeeded = false; + } + + return succeeded; +} + diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadcontroller.h --- a/browsercore/appfw/Api/Managers/downloadcontroller.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/downloadcontroller.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,27 +1,33 @@ /* * Copyright (c) 2010 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 __DOWNLOAD_CONTROLLER_H__ #define __DOWNLOAD_CONTROLLER_H__ #include <QObject> #include "BWFGlobal.h" +#include "downloadproxy.h" + +class QFileInfo; class QNetworkProxy; class QNetworkReply; class QNetworkRequest; @@ -29,8 +35,6 @@ class QUrl; class QWebPage; -class Download; - class DownloadControllerPrivate; class BWF_EXPORT DownloadController : public QObject @@ -41,38 +45,40 @@ DownloadController(const QString & client, const QNetworkProxy & proxy); ~DownloadController(); - static void debugDownload(Download * download); - public slots: bool handlePage(QWebPage * page); + void startDownload(const QUrl & url, const QFileInfo & info); + private slots: void startDownload(QNetworkReply * reply); void startDownload(const QNetworkRequest & request); signals: - void downloadCreated(Download * download); + void downloadCreated(DownloadProxy downloadProxy); - void downloadStarted(Download * download); + void downloadStarted(DownloadProxy downloadProxy); - void downloadHeaderReceived(Download * download); + void downloadHeaderReceived(DownloadProxy downloadProxy); - void downloadProgress(Download * download); + void downloadProgress(DownloadProxy downloadProxy); - void downloadFinished(Download * download); + void downloadFinished(DownloadProxy downloadProxy); - void downloadPaused(Download * download, const QString & error); + void downloadPaused(DownloadProxy downloadProxy, const QString & error); - void downloadCancelled(Download * download, const QString & error); + void downloadCancelled(DownloadProxy downloadProxy, const QString & error); - void downloadFailed(Download * download, const QString & error); + void downloadFailed(DownloadProxy downloadProxy, const QString & error); - void downloadNetworkLoss(Download * download, const QString & error); + void downloadNetworkLoss(DownloadProxy downloadProxy, const QString & error); - void downloadError(Download * download, const QString & error); + void downloadError(DownloadProxy downloadProxy, const QString & error); void downloadsCleared(); + void unsupportedDownload(const QUrl & url); + private: DownloadControllerPrivate * d; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadcontroller_p.h --- a/browsercore/appfw/Api/Managers/downloadcontroller_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/downloadcontroller_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 __DOWNLOAD_CONTROLLER_PRIVATE_H__ #define __DOWNLOAD_CONTROLLER_PRIVATE_H__ @@ -26,6 +29,7 @@ class QString; class QUrl; +class Download; class DownloadEvent; class DownloadManager; @@ -41,6 +45,7 @@ ~DownloadControllerPrivate(); + void startDownload(const QUrl & url, const QFileInfo & info); void startDownload(QNetworkReply * reply); void startDownload(const QNetworkRequest & request); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadproxy.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/downloadproxy.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#include "downloadproxy.h" +#include "downloadproxy_p.h" + +DownloadProxy::DownloadProxy(DownloadProxyData * data) +: m_data(data) +{ +} + +DownloadProxy::~DownloadProxy() +{ +} + +void DownloadProxy::debug() +{ + m_data->debug(); +} + +void DownloadProxy::remove() +{ + m_data->remove(); +} + +QString DownloadProxy::fileName() +{ + return m_data->fileName(); +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadproxy.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/downloadproxy.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,58 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef __DOWNLOAD_PROXY_H__ +#define __DOWNLOAD_PROXY_H__ + +#include <QString> +#include <QSharedPointer> + +#include "BWFGlobal.h" + +// Each DownloadProxy object encapsulates an instance of the Download class +// used by the Download Manager. DownloadProxy is used to shield client +// code from direct knowledge of the Download class. +// +// Knowledge of the Download class is confined to the DownloadProxyData class. +// DownloadProxyData objects are created by the DownloadController as necessary +// to construct DownloadProxy objects that may be exposed to client code via +// signals or other mechanisms. + +class DownloadProxyData; + +class BWF_EXPORT DownloadProxy +{ +public: + DownloadProxy(DownloadProxyData * data); + + ~DownloadProxy(); + + void debug(); + + void remove(); + + QString fileName(); + +private: + QSharedPointer<DownloadProxyData> m_data; +}; + +#endif // __DOWNLOAD_PROXY_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadproxy_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/downloadproxy_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,46 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef __DOWNLOAD_PROXY_P_H__ +#define __DOWNLOAD_PROXY_P_H__ + +#include <QString> + +class Download; + +class DownloadProxyData +{ +public: + DownloadProxyData(Download * download); + + ~DownloadProxyData(); + + void debug(); + + void remove(); + + QString fileName(); + +private: + Download * m_download; +}; + +#endif // __DOWNLOAD_PROXY_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/downloadproxydata.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/downloadproxydata.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,320 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#include "downloadproxy_p.h" + +#include <QNetworkReply> +#include <QtDebug> + +#ifdef USE_DOWNLOAD_MANAGER +#include "download.h" +#include "downloadmanager.h" +#endif // USE_DOWNLOAD_MANAGER + +DownloadProxyData::DownloadProxyData(Download * download) +: m_download(download) +{} + +DownloadProxyData::~DownloadProxyData() +{ + // Nothing to do, Download * is owned by DownloadManager. +} + +#ifdef USE_DOWNLOAD_MANAGER + +// Helper functions for translating various download attribute enum values. + +static const char * downloadState(int state) +{ + switch (state) { + case DlNone: + return "None"; + case DlCreated: + return "Created"; + case DlStarted: + return "Started"; + case DlInprogress: + return "InProgress"; + case DlPaused: + return "Paused"; + case DlCompleted: + return "Completed"; + case DlFailed: + return "Failed"; + case DlCancelled: + return "Cancelled"; + case DlDescriptorUpdated: + return "DescriptorUpdated"; + default: + return "???"; + } +} + +static const char * downloadError(QNetworkReply::NetworkError error) +{ + switch (error) { + case QNetworkReply::NoError: + return "QNetworkReply::NoError"; + case QNetworkReply::ConnectionRefusedError: + return "QNetworkReply::ConnectionRefusedError"; + case QNetworkReply::RemoteHostClosedError: + return "QNetworkReply::RemoteHostClosedError"; + case QNetworkReply::HostNotFoundError: + return "QNetworkReply::HostNotFoundError"; + case QNetworkReply::TimeoutError: + return "QNetworkReply::TimeoutError"; + case QNetworkReply::OperationCanceledError: + return "QNetworkReply::OperationCanceledError"; + case QNetworkReply::SslHandshakeFailedError: + return "QNetworkReply::SslHandshakeFailedError"; + case QNetworkReply::ProxyConnectionRefusedError: + return "QNetworkReply::ProxyConnectionRefusedError"; + case QNetworkReply::ProxyConnectionClosedError: + return "QNetworkReply::ProxyConnectionClosedError"; + case QNetworkReply::ProxyNotFoundError: + return "QNetworkReply::ProxyNotFoundError"; + case QNetworkReply::ProxyTimeoutError: + return "QNetworkReply::ProxyTimeoutError"; + case QNetworkReply::ProxyAuthenticationRequiredError: + return "QNetworkReply::ProxyAuthenticationRequiredError"; + case QNetworkReply::ContentAccessDenied: + return "QNetworkReply::ContentAccessDenied"; + case QNetworkReply::ContentOperationNotPermittedError: + return "QNetworkReply::ContentOperationNotPermittedError"; + case QNetworkReply::ContentNotFoundError: + return "QNetworkReply::ContentNotFoundError"; + case QNetworkReply::AuthenticationRequiredError: + return "QNetworkReply::AuthenticationRequiredError"; + case QNetworkReply::ContentReSendError: + return "QNetworkReply::ContentReSendError"; + case QNetworkReply::ProtocolUnknownError: + return "QNetworkReply::ProtocolUnknownError"; + case QNetworkReply::ProtocolInvalidOperationError: + return "QNetworkReply::ProtocolInvalidOperationError"; + case QNetworkReply::UnknownNetworkError: + return "QNetworkReply::UnknownNetworkError"; + case QNetworkReply::UnknownProxyError: + return "QNetworkReply::UnknownProxyError"; + case QNetworkReply::UnknownContentError: + return "QNetworkReply::UnknownContentError"; + case QNetworkReply::ProtocolFailure: + return "QNetworkReply::ProtocolFailure"; + default: + return "???"; + } +} + +// Helper functions to get download attribute of a particular type. + +static int intAttribute(Download * download, DownloadAttribute which) +{ + return download->getAttribute(which).toInt(); +} + +static uint uintAttribute(Download * download, DownloadAttribute which) +{ + return download->getAttribute(which).toUInt(); +} + +static QString stringAttribute(Download * download, DownloadAttribute which) +{ + return download->getAttribute(which).toString(); +} + +// Helper functions for reporting download attributes. + +template<typename T> +void debugDownloadAttribute( + Download * download, + char const * name, + const T & value) +{ + qDebug() << "DL" << download->id() << name << value; +} + +static void debugDownloadInt( + Download * download, + DownloadAttribute which, + const char * name) +{ + int value = intAttribute(download, which); + + debugDownloadAttribute(download, name, value); +} + +static void debugDownloadUInt( + Download * download, + DownloadAttribute which, + const char * name) +{ + uint value = uintAttribute(download, which); + + debugDownloadAttribute(download, name, value); +} + +static void debugDownloadStr( + Download * download, + DownloadAttribute which, + const char * name) +{ + QString value = stringAttribute(download, which); + + debugDownloadAttribute(download, name, value); +} + +static void debugDownloadState(Download * download) +{ + int num = intAttribute(download, DlDownloadState); + + const char * state = downloadState(num); + + debugDownloadAttribute(download, "DownloadState", state); + +} + +static void debugDownloadError(Download * download) +{ + int num = intAttribute(download, DlLastError); + + const char * error = downloadError(static_cast<QNetworkReply::NetworkError>(num)); + + debugDownloadAttribute(download, "DownloadError", error); +} + +// Helper function for implementing DownloadProxyData::debug(). + +static void debugDownload(Download * download) +{ + debugDownloadState(download); + + debugDownloadError(download); + + debugDownloadStr(download, + DlLastErrorString, + "LastErrorString"); + + debugDownloadStr(download, + DlSourceUrl, + "SourceUrl"); + + debugDownloadStr(download, + DlContentType, + "ContentType"); + + debugDownloadStr(download, + DlDestPath, + "DestPath"); + + debugDownloadStr(download, + DlFileName, + "FileName"); + + debugDownloadInt(download, + DlDownloadedSize, + "DownloadedSize"); + + debugDownloadInt(download, + DlTotalSize, + "TotalSize"); + + debugDownloadInt(download, + DlLastPausedSize, + "LastPausedSize"); + + debugDownloadInt(download, + DlPercentage, + "Percentage"); + + debugDownloadStr(download, + DlStartTime, + "StartTime"); + + debugDownloadStr(download, + DlEndTime, + "EndTime"); + + debugDownloadUInt(download, + DlElapsedTime, + "ElapsedTime"); + + debugDownloadStr(download, + DlRemainingTime, + "RemainingTime"); + + debugDownloadStr(download, + DlSpeed, + "Speed"); + + debugDownloadInt(download, + DlProgressInterval, + "ProgressInterval"); +} + +#endif // USE_DOWNLOAD_MANAGER + +void DownloadProxyData::debug() +{ +#ifdef USE_DOWNLOAD_MANAGER + if (m_download == 0) { + return; + } + + int id = m_download->id(); + + DownloadManager * manager = m_download->downloadManager(); + + Download * download = manager->findDownload(id); + + if (download != 0) { + debugDownload(download); + } +#endif // USE_DOWNLOAD_MANAGER +} + +void DownloadProxyData::remove() +{ +#ifdef USE_DOWNLOAD_MANAGER + if (m_download == 0) { + return; + } + + DownloadManager * manager = m_download->downloadManager(); + + manager->removeOne(m_download); + + // Download is no longer valid. + + m_download = 0; +#endif // USE_DOWNLOAD_MANAGER +} + +QString DownloadProxyData::fileName() +{ +#ifdef USE_DOWNLOAD_MANAGER + if (m_download == 0) { + return QString(); + } + + return stringAttribute(m_download, DlFileName); +#else // USE_DOWNLOAD_MANAGER + return QString(); +#endif // USE_DOWNLOAD_MANAGER +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/lowmemoryhandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/lowmemoryhandler.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#include "lowmemoryhandler.h" +#include "lowmemoryhandler_p.h" + +LowMemoryHandler::LowMemoryHandler(QObject* parent) + : QObject(parent) + , d_ptr(new LowMemoryHandlerPrivate) + +{ + Q_D(LowMemoryHandler); + d->q_ptr = this; +} + +LowMemoryHandler::~LowMemoryHandler() +{ + Q_D(LowMemoryHandler); + delete d; +} + +void LowMemoryHandler::start() +{ + Q_D(LowMemoryHandler); + d->start(); +} + +void LowMemoryHandler::stop() +{ + Q_D(LowMemoryHandler); + d->stop(); +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/lowmemoryhandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/lowmemoryhandler.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef __LOWMEMORYHANDLER_H__ +#define __LOWMEMORYHANDLER_H__ + +#include <QObject> + +class LowMemoryHandlerPrivate; + +class LowMemoryHandler : public QObject +{ + Q_OBJECT + +public: + LowMemoryHandler(QObject* parent = 0); + virtual ~LowMemoryHandler(); + +public slots: + void start(); + void stop(); + +signals: + void lowMemory(); + void outOfMemory(); + +private: + LowMemoryHandlerPrivate* const d_ptr; + Q_DECLARE_PRIVATE(LowMemoryHandler) +}; + +#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/lowmemoryhandler_p.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/lowmemoryhandler_p.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + + +#include "lowmemoryhandler_p.h" +#include "lowmemoryhandler.h" + +LowMemoryHandlerPrivate::LowMemoryHandlerPrivate() +{ +} + +LowMemoryHandlerPrivate::~LowMemoryHandlerPrivate() +{ +} + +void LowMemoryHandlerPrivate::start() +{ +} + +void LowMemoryHandlerPrivate::stop() +{ +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/lowmemoryhandler_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/lowmemoryhandler_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,61 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef __LOWMEMORYHANDLERPRIVATE_H__ +#define __LOWMEMORYHANDLERPRIVATE_H__ + +#include <QObject> + +#ifdef Q_OS_SYMBIAN +#include <e32base.h> +#include <e32std.h> +#endif + +class LowMemoryHandler; + +class LowMemoryHandlerPrivate +#ifdef Q_OS_SYMBIAN + : public CActive +#endif +{ + Q_DECLARE_PUBLIC(LowMemoryHandler) + +public: + LowMemoryHandlerPrivate(); + virtual ~LowMemoryHandlerPrivate(); + + void start(); + void stop(); + + LowMemoryHandler* q_ptr; + +private: +#ifdef Q_OS_SYMBIAN + void DoCancel(); + void RunL(); + TInt RunError(); + + RChangeNotifier iNotifier; + TBool iInitialized; +#endif +}; + +#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/lowmemoryhandler_p_s60.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/appfw/Api/Managers/lowmemoryhandler_p_s60.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,85 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + + +#include "lowmemoryhandler_p.h" +#include "lowmemoryhandler.h" + +LowMemoryHandlerPrivate::LowMemoryHandlerPrivate() + : CActive(EPriorityStandard) + , iInitialized(EFalse) +{ + CActiveScheduler::Add(this); + TInt err = iNotifier.Create(); + // TODO: handle err +} + +LowMemoryHandlerPrivate::~LowMemoryHandlerPrivate() +{ + Cancel(); + iNotifier.Close(); +} + +void LowMemoryHandlerPrivate::start() +{ + if (IsActive()) + return; + + TInt err = iNotifier.Logon(iStatus); + // TODO: handle err + SetActive(); +} + +void LowMemoryHandlerPrivate::stop() +{ + Cancel(); +} + +void LowMemoryHandlerPrivate::DoCancel() +{ + iNotifier.LogonCancel(); +} + +void LowMemoryHandlerPrivate::RunL() +{ + if (iInitialized == EFalse) { + iInitialized = ETrue; + } else { + TInt changes = iStatus.Int(); + + Q_Q(LowMemoryHandler); + + if (changes & EChangesOutOfMemory) { + emit(q->outOfMemory()); + } else if (changes & EChangesLowMemory) { + emit(q->lowMemory()); + } + } + + User::LeaveIfError(iNotifier.Logon(iStatus)); + SetActive(); +} + +TInt LowMemoryHandlerPrivate::RunError() +{ + iNotifier.Close(); + return KErrNone; +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/secureuicontroller.cpp --- a/browsercore/appfw/Api/Managers/secureuicontroller.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/secureuicontroller.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,25 +1,29 @@ /* * 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: * */ - #include <QSslError> #include "secureuicontroller_p.h" #include "secureuicontroller.h" +#include "webpagecontroller.h" namespace WRT { @@ -184,10 +188,13 @@ * * This function should be called when the final load ended. */ -void SecureUIController::endSecureCheck(bool) +void SecureUIController::endSecureCheck(bool loadFinished) { //qDebug()<<"endSecureCheck Internal state = "<<d->m_internalState; + if (!loadFinished) + setTopLevelScheme(WebPageController::getSingleton()->currentDocUrl()); + /* Save the current secure state */ determineSecureState(); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/secureuicontroller.h --- a/browsercore/appfw/Api/Managers/secureuicontroller.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/secureuicontroller.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __SECUREUICONTROLLER_H__ #define __SECUREUICONTROLLER_H__ @@ -23,7 +26,7 @@ #include <QSslError> #include <QNetworkReply> #include "BWFGlobal.h" -#include <qwebframe.h> +#include <QWebFrame> #include <QMessageBox> #include "messageboxproxy.h" @@ -73,7 +76,7 @@ void setTopLevelScheme(const QUrl & url); void secureCheck(QWebFrame* frame, QNetworkRequest* request); - void endSecureCheck(bool); + void endSecureCheck(bool loadFinished); void onSslErrors(QNetworkReply*,const QList<QSslError> &); signals: diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/secureuicontroller_p.h --- a/browsercore/appfw/Api/Managers/secureuicontroller_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/secureuicontroller_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __SECUREUICONTROLLER_P_H__ #define __SECUREUICONTROLLER_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/viewcontroller.cpp --- a/browsercore/appfw/Api/Managers/viewcontroller.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/viewcontroller.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include <QDebug> #include "viewcontroller.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/viewcontroller.h --- a/browsercore/appfw/Api/Managers/viewcontroller.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/viewcontroller.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 VIEWCONTROLLER_H #define VIEWCONTROLLER_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/webpagecontroller.cpp --- a/browsercore/appfw/Api/Managers/webpagecontroller.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/webpagecontroller.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,62 +1,67 @@ /* * 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: * */ - #include <assert.h> +#include "BookmarksManager.h" #include "actionjsobject.h" -#include "qwebframe.h" -#include "qwebhistory.h" -#include "qgraphicswebview.h" #include "webpagedata.h" #include "wrtbrowsercontainer.h" #include "wrtbrowsercontainer_p.h" #include "webpagecontroller_p.h" #include "webpagecontroller.h" -#include "webcontentview.h" #include "UiUtil.h" -//#include "wrtsettings.h" #include "bedrockprovisioning.h" #include "secureuicontroller.h" #include "LoadController.h" +#include "ContentAgent.h" +#include "lowmemoryhandler.h" +#include <QWebFrame> +#include <QWebHistory> +#include <QGraphicsWebView> #include <QFile> #include <QDir> #include <QtGui> -#include <qdesktopservices.h> #include <QCoreApplication> +#include <QWebSecurityOrigin> +#include <QWebDatabase> +#include <QWebSettings> +#include <QtCore/QSettings> +using namespace WRT; -#define BEDROCK_APPLICATION_NAME "Bedrock" -#define BEDROCK_VERSION_DEFAULT "BetaRelease" +#if defined(Q_OS_SYMBIAN) // for shareToMail +#include <miutset.h> +#include <sendui.h> +#include <cmessagedata.h> +#include <txtrich.h> +#include <SendUiConsts.h> +const TUid KShareOnline = { 0x200009D5 }; +const TUid KShareOnOvi = { 0x2001AA43 }; +#endif + #define MAX_NUM_WINDOWS_TO_RESTORE 5 #define MAX_NUM_WINDOWS 5 static const char KHISTORYEXTENSION[] = ".history"; -void BWF_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path); - -// -------------------------------------------- - -//QEvent::Type WebPageControllerUpdateViewPortEvent::staticType() { -// static int s_type = QEvent::registerEventType(); -// return (QEvent::Type)s_type; -//} - -// -------------------------------------------- - WebPageControllerPrivate::WebPageControllerPrivate(WebPageController* qq) : q(qq), m_widgetParent(0), @@ -76,31 +81,36 @@ m_actionBack->setObjectName("back"); m_actionForward = new QAction("Forward",m_widgetParent); m_actionForward->setObjectName("forward"); - m_actionWebInspector = new QAction("Web Inspector",m_widgetParent); - m_actionWebInspector->setObjectName("webInspector"); m_actionReload->setEnabled(false); m_actionStop->setEnabled(false); m_actionBack->setEnabled(false); m_actionForward->setEnabled(false); - m_actionWebInspector->setVisible(false); } WebPageControllerPrivate::~WebPageControllerPrivate() { // save history in the persistent storage, delete history files first + bool enabled = (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("SaveSession"); if (enabled) { q->deleteHistory(); if(donotsaveFlag == false) { - q->saveNumberOfWindows(); - q->saveHistory(); + int windowsSaved = 0; + int activeWindowId = 0; + q->saveHistory(&windowsSaved, &activeWindowId); + q->saveNumberOfWindows(windowsSaved); + q->saveActiveWindowId(activeWindowId); } donotsaveFlag = true; } + else + { + q->deleteDataFiles(); + } /* #if defined(Q_OS_SYMBIAN) // clean up all pages while ( !m_allPages.isEmpty() ) @@ -134,35 +144,33 @@ WebPageController::WebPageController ( QObject* parent ) : QObject ( parent ), - d(new WebPageControllerPrivate(this)) + m_networkError (false), + m_networkErrorMsg("No network error"), + m_networkErrorUrl("No Url"), + m_promptMsg("No message"), + m_promptReserved(""), + m_memoryHandler(new LowMemoryHandler(this)), + d(new WebPageControllerPrivate(this)), + m_settingsLoaded(0), + m_bErrorUrlMatches(false) { // Register a new MetaType WebPageData. It is needed to serialize history (starage) qRegisterMetaTypeStreamOperators<WebPageData> ("WebPageData"); -#ifndef QT_NO_DESKTOPSERVICES - d->m_historyDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -#else - d->m_historyDir = QDir::homePath(); -#endif -#ifdef Q_OS_SYMBIAN - if (d->m_historyDir.startsWith("Z")) - d->m_historyDir.replace(0,1,"C"); -#endif + d->m_historyDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory"); // auto-connect actions connect( d->m_actionReload, SIGNAL( triggered() ), this, SLOT( currentReload() ) ); connect( d->m_actionStop, SIGNAL( triggered() ), this, SLOT( currentStop() ) ); connect( d->m_actionBack, SIGNAL( triggered() ), this, SLOT( currentBack() ) ); connect( d->m_actionForward, SIGNAL( triggered() ), this, SLOT( currentForward() ) ); - connect( d->m_actionWebInspector, SIGNAL( triggered() ), this, SLOT( webInspector() ) ); - // Catch changes to settings - connect(BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning(), SIGNAL(settingChanged(const QString &)), this, SLOT(settingChanged(const QString &))); - - // Initialize UA specific params. - initUASettingsAndData(); - // initialize from settings - settingChanged("DeveloperExtras"); + connect( m_memoryHandler, SIGNAL( lowMemory() ), this, SIGNAL( lowMemory() ) ); + connect( m_memoryHandler, SIGNAL( lowMemory() ), this, SLOT( handleLowMemory() ) ); + connect( m_memoryHandler, SIGNAL( outOfMemory() ), this, SIGNAL( outOfMemory() ) ); + connect( m_memoryHandler, SIGNAL( outOfMemory() ), this, SLOT( handleOutOfMemory() ) ); + m_memoryHandler->start(); + updateJSActions(); m_bRestoreSession = false; @@ -173,6 +181,7 @@ WebPageController::~WebPageController() { + m_memoryHandler->stop(); delete d; } @@ -197,23 +206,34 @@ Q_ASSERT( page ); page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("DeveloperExtras")); + connect( page, SIGNAL( loadFinished(bool) ), SLOT( onLoadFinishedForBackgroundWindow(bool) ) ); + + // emit signal indicating that new page is being created + emit creatingPage( page ); /* Add the new page after the current page */ WRT::WrtBrowserContainer * theCurrentPage = currentPage(); int index = d->m_allPages.indexOf(theCurrentPage); d->m_allPages.insert (index+1, page ); + // set the max number of pages to hold in the memory page cache to pages + // The Page Cache allows for a nicer user experience when navigating forth or back to pages in + // the forward/back history, by pausing and resuming up to pages per page group + + int maxPagesInCache = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("MaxPagesInCache"); + page->settings()->setMaximumPagesInCache(maxPagesInCache); // emit signal emit pageCreated( page ); - // AUTO-activate this page ONLY if there are no other pages if(d->m_allPages.size() == 1) { setCurrentPage(page); } int count = historyWindowCount(); - if(index+1 < count) + int activeWinId = activeWindowId(); + + if (m_bRestoreSession) startupRestoreHistory(NULL, index+1, page); } @@ -221,7 +241,7 @@ } -QWebPage* WebPageController::openPage() +WRT::WrtBrowserContainer* WebPageController::openPage() { WRT::WrtBrowserContainer* page = NULL; @@ -231,7 +251,7 @@ return page; } -QWebPage* WebPageController::openPageFromHistory(int index) +WRT::WrtBrowserContainer* WebPageController::openPageFromHistory(int index) { QDir dir(d->m_historyDir); QFileInfoList fileList(dir.entryInfoList(QDir::Files)); @@ -263,57 +283,59 @@ */ void WebPageController::closePage ( WRT::WrtBrowserContainer *page ) { - WRT::WrtBrowserContainer * theCurrentPage = currentPage(); - bool updateCurrentPageIndex = false; + if(pageCount() > 1) { + WRT::WrtBrowserContainer * theCurrentPage = currentPage(); + bool updateCurrentPageIndex = false; - // get index of page we want to remove - int closeIndex = d->m_allPages.indexOf(page); - if(closeIndex < 0) - return; + // get index of page we want to remove + int closeIndex = d->m_allPages.indexOf(page); + if(closeIndex < 0) + return; - // was this page the "current page?" - // if so, we need to select the page to become the new one - // select the previous page unless at the beginning, then select next - if(page == theCurrentPage) { - int newCurrIndex = closeIndex - 1; - if(closeIndex == 0 ) { - newCurrIndex = closeIndex + 1; - } + // was this page the "current page?" + // if so, we need to select the page to become the new one + // select the previous page unless at the beginning, then select next + if(page == theCurrentPage) { + int newCurrIndex = closeIndex - 1; + if(closeIndex == 0 ) { + newCurrIndex = closeIndex + 1; + } - // change the current page - if(newCurrIndex >= 0) { - theCurrentPage = d->m_allPages.at(newCurrIndex); - setCurrentPage(theCurrentPage); - updateCurrentPageIndex = true; + // change the current page + if(newCurrIndex >= 0) { + theCurrentPage = d->m_allPages.at(newCurrIndex); + setCurrentPage(theCurrentPage); + updateCurrentPageIndex = true; + } + else { + d->m_currentPage = -1; + emit pageChanged(page, NULL); + } } else { - d->m_currentPage = -1; - emit pageChanged(page, NULL); + /* Adjust m_currentPage if the index of the page deleted is less than + * current page + */ + if (closeIndex < d->m_currentPage ) + updateCurrentPageIndex = true; } - } - else { - /* Adjust m_currentPage if the index of the page deleted is less than - * current page - */ - if (closeIndex < d->m_currentPage ) - updateCurrentPageIndex = true; - } + + // actually delete the page from the list + d->m_allPages.removeAt(closeIndex); - // actually delete the page from the list - d->m_allPages.removeAt(closeIndex); + // update the current page index if necessary + // (this will just update the index now that we've removed the page from the list) + if(updateCurrentPageIndex) { + int index = d->m_allPages.indexOf(theCurrentPage); + if(index >= 0) + d->m_currentPage = index; + } - // update the current page index if necessary - // (this will just update the index now that we've removed the page from the list) - if(updateCurrentPageIndex) { - int index = d->m_allPages.indexOf(theCurrentPage); - if(index >= 0) - d->m_currentPage = index; + // and emit sig that it was done + emit pageDeleted(page); + + delete page; } - - // and emit sig that it was done - emit pageDeleted(page); - - delete page; } /*! @@ -347,44 +369,170 @@ disconnect(oldPage->networkAccessManager(), 0, this, 0); disconnect(oldPage->loadController(), 0, this, 0); connect(oldPage, SIGNAL(createNewWindow(WrtBrowserContainer*)), this, SLOT(createWindow(WrtBrowserContainer*))); + connect(oldPage, SIGNAL(loadFinished(bool)), SLOT(onLoadFinishedForBackgroundWindow(bool))); } - // aggregate "current page" signalling from this page to PageMgr clients connect(page, SIGNAL(secureStateChange(int)), this, SLOT(secureStateChange(int))); connect( page->mainFrame(), SIGNAL ( titleChanged ( const QString& ) ), SIGNAL ( titleChanged ( const QString& ) ) ); connect( page, SIGNAL( loadStarted() ), SIGNAL( loadStarted() ) ); + connect( page->mainFrame(), SIGNAL(initialLayoutCompleted() ), SIGNAL( initialLayoutCompleted() ) ); connect( page, SIGNAL( loadProgress(int) ), SIGNAL( loadProgress(int) ) ); - connect( page, SIGNAL( loadFinished(bool) ), SIGNAL( loadFinished(bool) ) ); + connect( page, SIGNAL( loadFinished(bool) ), SLOT( onLoadFinished(bool) ) ); + + connect( page, SIGNAL( databaseQuotaExceeded (QWebFrame *,QString) ), SLOT( onDatabaseQuotaExceeded (QWebFrame *,QString)) ); + connect( page->mainFrame(), SIGNAL( iconChanged() ), SIGNAL( pageIconChanged() ) ); connect( page->loadController(), SIGNAL( pageLoadStarted() ), SIGNAL( pageLoadStarted() ) ); + connect( page->loadController(), SIGNAL( pageLoadFailed() ), SIGNAL( pageLoadFailed() ) ); connect( page->loadController(), SIGNAL( pageLoadProgress(int) ), SIGNAL( pageLoadProgress(int) ) ); connect( page->loadController(), SIGNAL( pageLoadFinished(bool) ), SIGNAL( pageLoadFinished(bool) ) ); connect( page->loadController(), SIGNAL( pageUrlChanged(QString) ), SIGNAL( pageUrlChanged(QString) ) ); connect( page, SIGNAL(createNewWindow(WrtBrowserContainer*)), this, SLOT(createWindow(WrtBrowserContainer*))); + // Connect the unsuportedContent signal to start a new download connect( page, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(unsupportedContentArrived(QNetworkReply *))); connect( page, SIGNAL( loadStarted() ), SLOT( updateStatePageLoading() ) ); - connect( page, SIGNAL( loadFinished(bool) ), SLOT( updateStatePageLoadComplete(bool) ) ); + connect( page->mainFrame(), SIGNAL( iconChanged() ), this, SIGNAL( currentPageIconChanged() ) ); connect( page->mainFrame(), SIGNAL( urlChanged( const QUrl &)), this, SIGNAL( currentPageUrlChanged( const QUrl &) )); connect( page->mainFrame(), SIGNAL( urlChanged( const QUrl &)), this, SLOT( urlChanged( const QUrl &) )); - connect( page, SIGNAL( networkRequestStarted(QWebFrame*, QNetworkRequest*)), this, SIGNAL( networkRequestStarted(QWebFrame*, QNetworkRequest*))); connect( page->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)), this, SIGNAL( sslErrors(QNetworkReply *, const QList<QSslError> &))); connect( page->networkAccessManager(), SIGNAL(showMessageBox(WRT::MessageBoxProxy*)), this, SIGNAL(showMessageBox(WRT::MessageBoxProxy*))); + // Connect network reply errors + connect( page->networkAccessManager(), SIGNAL( networkErrorHappened(const QString &) ), this, SIGNAL( networkErrorHappened(const QString &) ) ); + connect( page->networkAccessManager(), SIGNAL( networkErrorHappened(const QString &) ), this, SLOT( processNetworkErrorHappened(const QString &) ) ); + connect( page->networkAccessManager(), SIGNAL( networkErrorUrl(const QUrl &) ), this, SLOT( processNetworkErrorUrl(const QUrl &) ) ); + connect(currentPage(), SIGNAL(pageScrollPositionZero()), this, SIGNAL(pageScrollPositionZero()) ); connect(page, SIGNAL(scrollRequested(int, int, const QRect & )), this, SIGNAL(pageScrollRequested(int, int, const QRect & )) ); Q_ASSERT ( d->m_currentPage >= 0 ); - + updateActions(false); emit pageChanged( oldPage, page ); } + + +void WebPageController::onLoadFinished(bool ok) +{ + updateStatePageLoadComplete(ok); + if (ok) { + QTimer::singleShot(300, this, SLOT(updateHistory())); + } + else { + emit(loadFinished(false)); + } +} + + +void WebPageController::onDatabaseQuotaExceeded (QWebFrame *frame, QString database) +{ + QString dbdir = QWebSettings::offlineStoragePath (); + QDir dir(dbdir); + + if(!dir.exists()||(dir.count() <= 1)) // empty DB + return; + + + if(frame) + { + QWebSecurityOrigin qwso = frame->securityOrigin(); + qint64 quota = qwso.databaseQuota() ; + qint64 usage = qwso.databaseUsage() ; + } + m_promptMsg = "Database Quota Error"; + emit databaseQuotaExceeded (frame, database); + + return; +} + +void WebPageController::onLoadFinishedForBackgroundWindow(bool ok) +{ + if (!ok) + return; + WRT::WrtBrowserContainer* page = qobject_cast<WRT::WrtBrowserContainer*> (sender()); + if (page) + page->setUpdateThumbnail(true); +} + +void WebPageController::updateHistory() +{ + BookmarksManager::getSingleton()->addHistory(currentDocUrl(), currentDocTitle()); + emit(loadFinished(true)); +} + +/*! + * Handling of network error happens signal + * @return Returns current page handle + * @see WRT::WrtBrowserContainer + */ +void WebPageController::processNetworkErrorHappened(const QString & msg ) + { + m_networkError = true; + m_networkErrorMsg = msg; + } + +/*! + * Handling of network error associated url + * @return Returns current page handle + * @see WRT::WrtBrowserContainer + */ +void WebPageController::processNetworkErrorUrl(const QUrl & url ) + { + QString errorUrl = url.toString(); + QString requestedUrl = currentRequestedUrl(); + m_networkErrorUrl = url.toString(); + + // Check if requestedUrl matches the URL from the network error + // This is to resolve the problems when error popups occur when they shouldn't + // especially during download. + int matches = m_networkErrorUrl.compare(requestedUrl); + if (matches == 0) m_bErrorUrlMatches = true; + } + +//void QWEBKIT_EXPORT qt_drt_garbageCollector_collect(); + +/*! + * Try to release as much memory as possible from caches and collectors + */ +void WebPageController::releaseMemory() + { + // clears JavaScript Collector heap; private export in QWebFrame, so commented out for now + // qt_drt_garbageCollector_collect(); + + // webkit/webkit/qt/api + QWebSettings::clearIconDatabase(); + QWebSettings::clearMemoryCaches(); + + QPixmapCache::clear(); + } + +/*! + * Handle low memory signals from LowMemoryHandler + * @see LowMemoryHandler + */ +void WebPageController::handleLowMemory() + { + currentStop(); + releaseMemory(); + } + +/*! + * Handle out of memory signals from LowMemoryHandler + * @see LowMemoryHandler + */ +void WebPageController::handleOutOfMemory() + { + currentStop(); + releaseMemory(); + } + /*! * Retrieve a pointer to the current WRT::WrtBrowserContainer * @return Returns current page handle @@ -399,14 +547,6 @@ } /*! - Close the current page -*/ -void WebPageController::closeCurrentPage() -{ - closePage(currentPage()); -} - -/*! * Retrieve a list of all of the pages managed by WebPageController * @return List of all the pages opened by WebPageController * @see WRT::WrtBrowserContainer @@ -418,7 +558,7 @@ /*! * Retrieve the number of pages managed by WebPageController - * @return count of all the pages currently opend by WrtPagemanager + * @return count of all the pages currently opend by WebPageController */ int WebPageController::pageCount() { @@ -426,34 +566,6 @@ } /*! - * Find a given page by looking for its window name - * @param name : main frame name of the page to be searched - * @return : Handle to WRT::WrtBrowserContainer with frame name - * @see refer WRT::WrtBrowserContainer - */ -WRT::WrtBrowserContainer * WebPageController::findPageByMainFrameName(const QString & name) -{ - foreach(WRT::WrtBrowserContainer* page, d->m_allPages) { - if(name == page->mainFrame()->frameName()) - return page; - } - return NULL; -} - -/*! - Retrieve the title of the current page's main frame or - an empty string if there is no current page -*/ -QString WebPageController::title() -{ - WRT::WrtBrowserContainer* page = currentPage(); - if ( page ) - return page->pageTitle(); - else - return QString(); -} - -/*! Retrieve the icon of the current page's main frame or an NULL icon if there is no current page */ @@ -477,7 +589,7 @@ /*! Return the list of public QActions most relevant to the managers's current context (most approptiate for contextual menus, etc.) - * @return : returns public actions list (Reload, Stop, Forward, Back, WebInspector) + * @return : returns public actions list (Reload, Stop, Forward, Back) */ QList<QAction*> WebPageController::getContext() { @@ -488,8 +600,7 @@ d->m_actionForward << d->m_actionReload << d->m_actionStop << - d->m_actionForward << - d->m_actionWebInspector; + d->m_actionForward; return contextList; } @@ -530,15 +641,6 @@ } /*! - * Action for invoking the WebInspector - * @return : Returns handle to WebInspector public handle (Ownership with WebPageController) -*/ -QAction * WebPageController::getActionWebInspector() -{ - return d->m_actionWebInspector; -} - -/*! * Reload for the current page */ void WebPageController::currentReload() @@ -596,6 +698,97 @@ currentLoad(QUrl(url)); } +/* +Share the url through mail client +*/ +#if defined(Q_OS_SYMBIAN) +void WebPageController::share(const QString &url) +{ + QString body = url; + CSendUi* sendUi = CSendUi::NewLC(); + CMessageData* messageData = CMessageData::NewLC(); + + TSendingCapabilities sendingCapabilities; + sendingCapabilities.iFlags = TSendingCapabilities::ESupportsAttachments; + + // Not interested in these following services + CArrayFixFlat<TUid>* array = new (ELeave) CArrayFixFlat<TUid>(8); + CleanupStack::PushL(array); + array->AppendL(KSenduiTechnologyMmsUid); + array->AppendL(KSenduiTechnologyIMUid); + array->AppendL(KMmsDirectUpload); + array->AppendL(KMmsIndirectUpload); + array->AppendL(KMmsUploadService1Id); + array->AppendL(KMmsUploadService2Id); + array->AppendL(KMmsUploadService3Id); + array->AppendL(KMmsUploadService4Id); + array->AppendL(KShareOnline); + array->AppendL(KShareOnOvi); + + // Body + CParaFormatLayer* paraFormat = CParaFormatLayer::NewL(); + CleanupStack::PushL( paraFormat ); + CCharFormatLayer* charFormat = CCharFormatLayer::NewL(); + CleanupStack::PushL( charFormat ); + CRichText* bodyRichText = CRichText::NewL( paraFormat, charFormat ); + CleanupStack::PushL( bodyRichText ); + + TPtrC bodyPtr(reinterpret_cast<const TUint16*>(body.utf16())); + + if( bodyPtr.Length() ) + bodyRichText->InsertL( 0, bodyPtr ); + else + bodyRichText->InsertL( 0, KNullDesC ); + + messageData->SetBodyTextL( bodyRichText ); + sendUi->ShowQueryAndSendL(messageData, sendingCapabilities, array); + CleanupStack::PopAndDestroy( 6 ); // bodyRichText, charFormat, paraFormat, messageData, sendUi + } +#else +void WebPageController::share(const QString &url) +{ + return; // Not supported +} +#endif + +/* +Feedback from user +*/ +#if defined(Q_OS_SYMBIAN) +void WebPageController::feedbackMail(const QString &mailAddress, const QString &mailBody) +{ + QString to = mailAddress; + QString body = mailBody; + CSendUi* sendUi = CSendUi::NewLC(); + CMessageData* messageData = CMessageData::NewLC(); + + // Body + CParaFormatLayer* paraFormat = CParaFormatLayer::NewL(); + CleanupStack::PushL( paraFormat ); + CCharFormatLayer* charFormat = CCharFormatLayer::NewL(); + CleanupStack::PushL( charFormat ); + CRichText* bodyRichText = CRichText::NewL( paraFormat, charFormat ); + CleanupStack::PushL( bodyRichText ); + TPtrC ToPtr(reinterpret_cast<const TUint16*>(to.utf16())); + TPtrC bodyPtr(reinterpret_cast<const TUint16*>(body.utf16())); + if( bodyPtr.Length() ) + bodyRichText->InsertL( 0, bodyPtr ); + else + bodyRichText->InsertL( 0, KNullDesC ); + + messageData->AppendToAddressL( ToPtr ); + messageData->SetBodyTextL( bodyRichText ); + + TRAP_IGNORE(sendUi->CreateAndSendMessageL( KUidMsgTypeSMTP, messageData )); +// TRAP_IGNORE(sendUi->CreateAndSendMessageL( KSenduiMtmSmsUid, messageData )); + CleanupStack::PopAndDestroy( 5 ); +} +#else +void WebPageController::feedbackMail(const QString &mailAddress, const QString &mailBody) +{ + return; // Not supported +} +#endif /*! Load an item into the current page from a given /a historyIndex */ @@ -626,76 +819,16 @@ } } -void WebPageController::pageGotoCurrentItem(int index) -{ - - WRT::WrtBrowserContainer* page = d->m_allPages.at(index); - if(page) { - QList<QWebHistoryItem> items = page->history()->items(); - QWebHistoryItem item = page->history()->currentItem(); - if (item.isValid()) { - page->history()->goToItem(item); - } - } -} - -void WebPageController::pageReload(int index) -{ - - WRT::WrtBrowserContainer* page = d->m_allPages.at(index); - if(page) { - QList<QWebHistoryItem> items = page->history()->items(); - QWebHistoryItem item = page->history()->currentItem(); - if (item.isValid()) { - page->mainFrame()->load(item.url()); - } - } -} - - /*! - Initialize User Agent specific data / params. - */ -void WebPageController::initUASettingsAndData() -{ - QCoreApplication::setApplicationName(BEDROCK_APPLICATION_NAME); - //Set BrowserVersion: Format - VersionMajor.VersionMinor.SVNRevision - QString browserAppVersion = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("BedrockVersion"); - if (browserAppVersion.isEmpty()) - { - browserAppVersion = QString(BEDROCK_VERSION_DEFAULT); - } - QCoreApplication::setApplicationVersion(browserAppVersion); -} - -/*! - Activate Web Inspector -*/ -void WebPageController::webInspector() -{ - if (QWebSettings::globalSettings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) { - WRT::WrtBrowserContainer * activePage = currentPage(); - if(activePage) - activePage->triggerAction(QWebPage::InspectElement); - } -} - -/*! - * Private slot - */ -void WebPageController::settingChanged(const QString &key) -{ - if (d->m_actionWebInspector && key.endsWith("DeveloperExtras")) - d->m_actionWebInspector->setVisible(BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("DeveloperExtras")); -} - -/*! * Private slot */ void WebPageController::updateStatePageLoading() { updateActions(true); + // Reset to false for new page + m_bErrorUrlMatches = false; + // This is needed for loading a restored window (otherwise url bar is empty) currentPage()->loadController()->setUrlText(currentPage()->history()->currentItem().url().toString()); } @@ -715,7 +848,7 @@ { d->m_actionReload->setEnabled(!pageIsLoading); d->m_actionStop->setEnabled(pageIsLoading); - + WRT::WrtBrowserContainer* activePage = currentPage(); if(activePage) { @@ -723,7 +856,6 @@ int currItemIndex = activePage->history()->currentItemIndex(); d->m_actionBack->setEnabled((histLength > 1) && (currItemIndex > 0)); d->m_actionForward->setEnabled((histLength > 1) && (currItemIndex < (histLength-1))); - d->m_actionWebInspector->setVisible(QWebSettings::globalSettings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)); } } @@ -744,6 +876,14 @@ openPage(this,page) ; } +void WebPageController::LoadInNewWindow(const QString & url) +{ + QWebPage* newPage = openPage(); + if (newPage) { + newPage->mainFrame()->load(QUrl(url)); + } +} + /*! * Private slot * Emits signals based on secure state @@ -780,25 +920,41 @@ return singleton; } -QWebPage* BrowserPageFactory::openBrowserPage() +WRT::WrtBrowserContainer* BrowserPageFactory::openBrowserPage() { return WebPageController::getSingleton()->openPage(); } QString WebPageController::guessUrlFromString(const QString &s){ - QUrl u = WRT::UiUtil::guessUrlFromString(s); + QUrl u = WRT::UiUtil::guessUrlFromString(s); + return u.toString(); +} + +QString WebPageController::searchUrl(const QString &s){ + QUrl u = WRT::UiUtil::searchUrl(s); return u.toString(); } +QObjectList WebPageController::fetchSuggestions(const QString &s){ + QObjectList suggestList = WRT::ContentAgent::getSingleton()->getUISuggestion(s); + return suggestList; +} void WebPageController::loadLocalFile() { - QString chromeBaseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory2"); + QString chromeBaseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("LocalPagesBaseDirectory"); QString startPage = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("StartPage"); QString startPagePath = chromeBaseDir + startPage; + currentLoad(startPagePath); } +void WebPageController::loadInitialUrlFromOtherApp(QString url) +{ + m_bRestoreSession = FALSE; + currentLoad(url); +} + void WebPageController::loadFromHistory() { @@ -822,8 +978,12 @@ { openPageFromHistory(i); } - m_bRestoreSession = false; - // current window + m_bRestoreSession = false; + + // Go to current window + int pageIndex = activeWindowId(); + WRT::WrtBrowserContainer* page = d->m_allPages.at(pageIndex); + setCurrentPage(page); gotoCurrentItem(); } @@ -839,24 +999,6 @@ } -WRT::WrtBrowserContainer* WebPageController::restoreHistory(QWidget* parent, int index) -{ - Q_UNUSED(parent) - // restore the history state from the disk for the current page - QString indexStr; - indexStr.setNum(index); - QString historyFile = d->m_historyDir + QLatin1String("/history") + indexStr + QLatin1String(".history"); - WRT::WrtBrowserContainer* page = openPage(this,0); - - qDebug() << "historyFile>>:" << historyFile; - QFile file(historyFile); - if(file.open(QIODevice::ReadOnly)) { - QDataStream restore(&file); - restore >> *(page->history()); - file.close(); - } - return page; -} WRT::WrtBrowserContainer* WebPageController::startupRestoreHistory(QWidget* parent, int index, WRT::WrtBrowserContainer* page) { @@ -866,7 +1008,6 @@ indexStr.setNum(index); QString historyFile = d->m_historyDir + QLatin1String("/history") + indexStr + QLatin1String(".history"); - qDebug() << "historyFile>>:" << historyFile; QFile file(historyFile); if(file.open(QIODevice::ReadOnly)) { QDataStream restore(&file); @@ -905,48 +1046,53 @@ return winStr; } -void WebPageController::saveHistory() +void WebPageController::saveHistory(int* windowsSaved, int* activeWindowId) { QString indexStr; - unsigned int pageCount = d->m_allPages.count(); int index = 0; + unsigned int pageCount = d->m_allPages.count(); + + // Get index of current page WRT::WrtBrowserContainer* theCurrentPage = currentPage(); int currentIndex = d->m_allPages.indexOf(theCurrentPage); - - //if(pageCount == 1) - //{ - QWebHistoryItem item = theCurrentPage->history()->currentItem(); - - setLastUrl(item.url().toString()); - //} - + for (int tIndex = 0; tIndex < pageCount; tIndex++) { - if(tIndex == pageCount-1) - index = currentIndex; - else if(tIndex == currentIndex) - index = pageCount-1; - else - index = tIndex; - - if (index >= MAX_NUM_WINDOWS_TO_RESTORE) return; - indexStr.setNum(tIndex); - QString historyFile = d->m_historyDir + QLatin1String("/history") + indexStr + QLatin1String(".history"); - // Save the History state to disk - QFile file(historyFile); - if(file.open(QIODevice::WriteOnly)) { - QDataStream save(&file); - save << *(d->m_allPages.at(index)->history()); - qDebug() << "Saved History<<:" << historyFile; - file.flush(); - file.close(); + // Don't save blank windows + WrtBrowserContainer* page = d->m_allPages.at(tIndex); + QString pageUrl = page->history()->currentItem().url().toString(); + if (!pageUrl.isEmpty()) + { + + // In case of blank windows, reset the active window id + if (currentIndex == tIndex) *activeWindowId = index; + + // Serialize page to file + indexStr.setNum(index); + QString historyFile = d->m_historyDir + QLatin1String("/history") + indexStr + QLatin1String(".history"); + QFile file(historyFile); + if(file.open(QIODevice::WriteOnly)) { + QDataStream save(&file); + save << *(d->m_allPages.at(tIndex)->history()); + file.flush(); + file.close(); + } + index++; } } + + // Save last url + WRT::WrtBrowserContainer* currentPage = d->m_allPages.at(*activeWindowId); + QWebHistoryItem item = theCurrentPage->history()->currentItem(); + QString lastUrl = item.url().toString(); + setLastUrl(lastUrl); + *windowsSaved = index; } void WebPageController::deleteDataFiles() { + QDir dir(d->m_historyDir); QString lasturlFile = d->m_historyDir + QLatin1String("/lasturl") + QLatin1String(".dat"); @@ -964,12 +1110,59 @@ file2.remove(); file2.close(); } + + d->donotsaveFlag = true; } +QString WebPageController::getTextEncoding() +{ + //QString encoding = QWebSettings::globalSettings()->defaultTextEncoding(); + QString encoding = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("BrowserEncoding").toString(); + + if(encoding == "Automatic") + QWebSettings::globalSettings()->setDefaultTextEncoding(""); + else + QWebSettings::globalSettings()->setDefaultTextEncoding(encoding); + + return encoding; +} + + +void WebPageController::setTextEncoding(const QString & encoding ) +{ + if(encoding == "Automatic") + QWebSettings::globalSettings()->setDefaultTextEncoding(""); + else + QWebSettings::globalSettings()->setDefaultTextEncoding(encoding); + + BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->setValue("BrowserEncoding", encoding); + return ; +} + + +void WebPageController::setSettingsLoaded(int value) +{ + m_settingsLoaded = value; +} + +int WebPageController::getSettingsLoaded() +{ + return m_settingsLoaded; +} + void WebPageController::savePopupSettings(int val) { - BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->setValue("PopupBlocking", val); + BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->setValue("PopupBlocking", val); + + //qDebug() << "WebPageController::savePopupSettings " << val << d->m_allPages.count(); + for (int tIndex = 0; tIndex < d->m_allPages.count(); tIndex++) + { + WrtBrowserContainer* page = d->m_allPages.at(tIndex); + page->settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !val); + + } + } bool WebPageController::getPopupSettings() @@ -979,15 +1172,47 @@ } -void WebPageController::saveNumberOfWindows() + +void WebPageController::saveSaverestoreSettings(int val) +{ + BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->setValue("SaveSession", val); + BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->setValue("SaveHistory", val); + + if(val == 0) + d->donotsaveFlag = true; // do not save .dat file + else // val = 1 + d->donotsaveFlag = false; + +} + +bool WebPageController::getSaverestoreSettings() +{ + bool val = (bool)BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("SaveSession").toInt(); + return val; + +} + +void WebPageController::saveNumberOfWindows(int windowsSaved) { QString winFile = d->m_historyDir + QLatin1String("/numwindow") + QLatin1String(".dat"); - int winCount = d->m_allPages.count(); QFile file(winFile); if(file.open(QIODevice::WriteOnly)) { QTextStream textStream(&file); - textStream << winCount; + textStream << windowsSaved; + textStream.flush(); + file.close(); + } + +} +void WebPageController::saveActiveWindowId(int activeWindowId) +{ + QString winFile = d->m_historyDir + QLatin1String("/activewindow") + QLatin1String(".dat"); + + QFile file(winFile); + if(file.open(QIODevice::WriteOnly)) { + QTextStream textStream(&file); + textStream << activeWindowId; textStream.flush(); file.close(); } @@ -1007,6 +1232,19 @@ return winStr.toInt(); } +int WebPageController::activeWindowId() +{ + QString winFile = d->m_historyDir + QLatin1String("/activewindow") + QLatin1String(".dat"); + QFile file(winFile); + QString winStr = "0"; + if(file.open(QIODevice::ReadOnly)) { + QTextStream textStream(&file); + textStream >> winStr; + file.close(); + } + return winStr.toInt(); +} + int WebPageController::historyWindowCount() { QDir dir(d->m_historyDir); @@ -1022,12 +1260,6 @@ return windowCount; } -void WebPageController::networkRequestFinished(QNetworkReply *reply){ - if(reply->error() != QNetworkReply::NoError) { - emit networkRequestError(reply); - } -} - QString WebPageController::currentDocTitle() { assert(currentPage()); @@ -1043,6 +1275,7 @@ QString WebPageController::currentRequestedUrl() const { assert(currentPage()); + //qDebug() << __func__ << "Current Page" << currentPage() << "Requested Url " << currentPage()->mainFrame()->requestedUrl().toString(); return currentPage()->mainFrame()->requestedUrl().toString(); } @@ -1052,15 +1285,10 @@ return (partialUrl(currentPage()->mainFrame()->url())); } -QVariant WebPageController::currentContentWindowObject() +QString WebPageController::currentPartialReqUrl() { - try { - return currentPage()->mainFrame()->evaluateJavaScript("window"); - } - catch(...) { - qDebug() << "WebPageController::currentContentWindowObject: caught expection"; - return QVariant(); - } + assert(currentPage()); + return (partialUrl(currentPage()->mainFrame()->requestedUrl())); } int WebPageController::contentsYPos() @@ -1076,7 +1304,6 @@ int WebPageController::secureState() { - //qDebug() << __func__ << currentPage()->secureState(); return (currentPage()->secureState()); } @@ -1096,6 +1323,37 @@ } } + +bool WebPageController::removeDirectory(QDir &aDir) +{ + bool has_err = false; + if (aDir.exists()) + { + QFileInfoList entries = aDir.entryInfoList(QDir::NoDotAndDotDot | + QDir::Dirs | QDir::Files); + int count = entries.size(); + for (int idx = 0; ((idx < count) && (0 == has_err)); idx++) + { + QFileInfo entryInfo = entries[idx]; + QString path = entryInfo.absoluteFilePath(); + if (entryInfo.isDir()) + { + QDir dir(path); + has_err = removeDirectory(dir); + } + else + { + QFile file(path); + if (!file.remove()) + has_err = true; + } + } + if (!aDir.rmdir(aDir.absolutePath())) + has_err = true; + } + return(has_err); +} + void WebPageController::clearHistoryInMemory() { WRT::WrtBrowserContainer * activePage = currentPage(); @@ -1103,7 +1361,6 @@ { activePage->history()->clear(); } - d->donotsaveFlag = true; } void WebPageController::deleteHistory() @@ -1150,6 +1407,30 @@ void WebPageController::deleteCache() { + + QWebDatabase::removeAllDatabases(); + + QString str1 = QWebSettings::offlineStoragePath (); + QString str2 = QWebSettings::offlineWebApplicationCachePath (); + QWebSettings * globalSettings = QWebSettings::globalSettings(); + QString LocalStoragePath = globalSettings->localStoragePath(); + + /*QString deleteFlag = d->m_historyDir + QLatin1String("/deleteOfflineStorage"); + QFile deleteFileFlag(deleteFlag); + if(deleteFileFlag.open(QIODevice::WriteOnly)) { // create indicator that marks offline storage for deletion while next browser startup + deleteFileFlag.close(); + }*/ + + QDir LocalStorage(LocalStoragePath); + removeDirectory(LocalStorage); + + QString applicationCacheFile = d->m_historyDir + QLatin1String("/ApplicationCache.db"); + QFile file(applicationCacheFile); + if(file.open(QIODevice::ReadOnly)) { + file.remove(); // may fail if file in usage; will be deleted in next browser startup + file.close(); + } + if ( !BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DiskCacheEnabled").toBool() ) return; @@ -1203,7 +1484,6 @@ } - void WebPageController::urlChanged(const QUrl& url) { //private slot @@ -1211,7 +1491,6 @@ emit partialUrlChanged(urlString); } - QString WebPageController::partialUrl(const QUrl& url) { @@ -1246,31 +1525,31 @@ bool needRestore = false; for (int i = 0; i < allPages()->count(); i++) { - WRT::WrtBrowserContainer* page = allPages()->at(i); - QWebHistoryItem item = page->history()->currentItem(); - - WebPageData data = item.userData().value<WebPageData>(); + WRT::WrtBrowserContainer* page = allPages()->at(i); + QWebHistoryItem item = page->history()->currentItem(); + WebPageData data = item.userData().value<WebPageData>(); // If not still a blank window, check whether we need to update the img if (!page->emptyWindow() ){ QImage img = data.m_thumbnail; - - bool isSameMode = ( (img.size().width() > img.size().height()) == (currSize.width() > currSize.height()) ); - if (img.isNull() || !isSameMode) { - - qDebug() << "need new thumbnail!!!" << img.size() << ":" << currSize; - needRestore = true; - view->setPage(page); - page->setWebWidget(view); - QCoreApplication::sendEvent(view, new WebPageControllerUpdateViewPortEvent()); - page->savePageDataToHistoryItem(page->mainFrame(), &item); - } + bool isSameMode = ( (img.size().width() > img.size().height()) == (currSize.width() > currSize.height()) ); + if (img.isNull() || !isSameMode) { + needRestore = true; + view->setPage(page); + page->setWebWidget(view); + QCoreApplication::sendEvent(view, new WebPageControllerUpdateViewPortEvent()); + page->savePageDataToHistoryItem(page->mainFrame(), &item); + page->setUpdateThumbnail(false); + } + if (page->needUpdateThumbnail()) { + page->savePageDataToHistoryItem(page->mainFrame(), &item); + page->setUpdateThumbnail(false); + } } } // restore - if (needRestore) - { + if (needRestore) { view->setPage(savedPage); savedPage->setWebWidget(view); } @@ -1278,14 +1557,11 @@ void WebPageController::updatePageThumbnails() { - // update current page's thumbnail forcely + // update current page's thumbnail forcely since the scrolling position may change WRT::WrtBrowserContainer *page = currentPage(); QWebHistoryItem item = page->history()->currentItem(); - page->savePageDataToHistoryItem(page->mainFrame(), &item); - - WebPageData data = item.userData().value<WebPageData>(); - + page->setUpdateThumbnail(false); checkAndUpdatePageThumbnails(); } @@ -1298,6 +1574,7 @@ void WebPageController::urlTextChanged(QString str ) { + //qDebug() << __func__ << "Current Page" << currentPage() << "Url " << str; currentPage()->loadController()->setUrlText(str); } @@ -1322,7 +1599,7 @@ QString WebPageController::loadText() { - //qDebug() << __func__ << currentPage()->loadController()->urlText(); + //qDebug() << __func__ << "Current Page" << currentPage() << currentPage()->loadController()->urlText(); return currentPage()->loadController()->urlText(); } @@ -1333,6 +1610,31 @@ bool WebPageController::loadCanceled() { return currentPage()->loadController()->loadCanceled(); } + +bool WebPageController::networkError() { + return m_networkError; +} + +QString WebPageController::networkErrorMsg() { + return m_networkErrorMsg; +} + +QString WebPageController::networkErrorUrl() { + return m_networkErrorUrl; +} + +bool WebPageController::errorUrlMatches() { + return m_bErrorUrlMatches; +} + +QString WebPageController::promptMsg() { + return m_promptMsg; +} + +QString WebPageController::promptReserved() { + return m_promptReserved; +} + /*! \fn void WebPageController::pageCreated(WrtPage* newPage); emitted when a page is created diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/webpagecontroller.h --- a/browsercore/appfw/Api/Managers/webpagecontroller.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/webpagecontroller.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,43 +1,43 @@ /* * 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 __WRTPAGEMANAGER_H__ -#define __WRTPAGEMANAGER_H__ +#ifndef __WEBPAGECONTROLLER_H__ +#define __WEBPAGECONTROLLER_H__ //#include <QWidget> #include <QAction> #include <QNetworkReply> #include <QSslError> -#include <qwebframe.h> +#include <QWebFrame> #include <QIcon> #include <QEvent> #include "browserpagefactory.h" #include "BWFGlobal.h" #include "messageboxproxy.h" - -#define WEBPAGE_ZOOM_RANGE_MIN 25 -#define WEBPAGE_ZOOM_RANGE_MAX 300 -#define WEBPAGE_ZOOM_PAGE_STEP 20 +#include <QDir> class QGraphicsWebView; +class LowMemoryHandler; namespace WRT { - class WrtPage; class WrtBrowserContainer; } @@ -86,9 +86,9 @@ QString currentRequestedUrl() const; Q_PROPERTY(QString currentRequestedUrl READ currentRequestedUrl) - QVariant currentContentWindowObject(); - Q_PROPERTY(QVariant currentWindowObject READ currentContentWindowObject) - + QString currentPartialReqUrl(); + Q_PROPERTY(QUrl currentPartialReqUrl READ currentPartialReqUrl) + int currentPageIndex(); Q_PROPERTY(int currentPageIndex READ currentPageIndex) @@ -114,34 +114,44 @@ bool loadCanceled(); Q_PROPERTY(bool loadCanceled READ loadCanceled) - QWebPage* openPage(); - QWebPage* openPageFromHistory(int index); + bool errorUrlMatches(); + Q_PROPERTY(bool errorUrlMatches READ errorUrlMatches) + + bool networkError(); + Q_PROPERTY(bool networkError READ networkError) + + QString networkErrorMsg(); + Q_PROPERTY(QString networkErrorMsg READ networkErrorMsg) + + QString networkErrorUrl(); + Q_PROPERTY(QString networkErrorUrl READ networkErrorUrl) + + QString promptMsg(); + Q_PROPERTY(QString promptMsg READ promptMsg) + + QString promptReserved(); + Q_PROPERTY(QString promptReserved READ promptReserved) + + WRT::WrtBrowserContainer* openPage(); + WRT::WrtBrowserContainer* openPageFromHistory(int index); void closePage(WRT::WrtBrowserContainer*); WRT::WrtBrowserContainer* currentPage() const; - void closeCurrentPage(); QList<WRT::WrtBrowserContainer*>* allPages(); - WRT::WrtBrowserContainer * findPageByMainFrameName(const QString & name); - QString title(); -// QWidget * widgetParent(); - - void setOffline(bool offline); - void initUASettingsAndData(); - QList<QAction*> getContext(); // persistent storage related methods - void saveHistory(); - void clearHistoryInMemory(); + void saveHistory(int* windowsSaved, int* activeWindowId); void deleteHistory(); - WRT::WrtBrowserContainer* restoreHistory(QWidget* parent, int index); WRT::WrtBrowserContainer* startupRestoreHistory(QWidget* parent, int index, WRT::WrtBrowserContainer* page); - void saveNumberOfWindows(); + void saveNumberOfWindows(int windowsSaved); + void saveActiveWindowId(int activeWindowId); int restoreNumberOfWindows(); int historyWindowCount(); + int activeWindowId(); void setLastUrl(QString url); @@ -150,18 +160,20 @@ QGraphicsWebView* webView(); void updatePageThumbnails(); void resizeAndUpdatePageThumbnails(QSize& s); + QString partialUrl(const QUrl &url); + bool removeDirectory(QDir &aDir); + private: void checkAndUpdatePageThumbnails(); WRT::WrtBrowserContainer* openPage(QObject* parent, WRT::WrtBrowserContainer* page=0); + void releaseMemory(); public: // public actions available for this view QAction * getActionReload(); QAction * getActionStop(); QAction * getActionBack(); - QAction * getActionForward(); - QAction * getActionWebInspector(); - + QAction * getActionForward(); public slots: void setLoadState(int); int pageCount(); @@ -171,57 +183,76 @@ void deleteDataFiles(); void savePopupSettings(int); bool getPopupSettings(); + void saveSaverestoreSettings(int); + bool getSaverestoreSettings(); + void clearHistoryInMemory(); + QString getTextEncoding(); + void setTextEncoding(const QString & encoding ); + void setSettingsLoaded(int value); + int getSettingsLoaded(); + void currentReload(); void currentStop(); void currentBack(); void currentForward(); - void currentLoad(const QString &url); void currentLoad(const QUrl & url); void currentSetFromHistory(int historyIndex); void gotoCurrentItem(); - void pageGotoCurrentItem(int index); - void pageReload(int index); void setCurrentPage(WRT::WrtBrowserContainer*); + void LoadInNewWindow(const QString & url); - void webInspector(); - static WebPageController* getSingleton(); void urlTextChanged(QString ); + void loadInitialUrlFromOtherApp(QString url); void loadFromHistory(); void loadLocalFile(); QString guessUrlFromString(const QString &s); + QString searchUrl(const QString &s); + QObjectList fetchSuggestions(const QString &s); + + void updateHistory(); + + void share(const QString &url); + void feedbackMail(const QString &mailAddress, const QString &mailBody); private slots: - void settingChanged(const QString &key); void updateStatePageLoading(); void updateStatePageLoadComplete(bool); void updateActions(bool pageIsLoading=false); void unsupportedContentArrived(QNetworkReply *); void createWindow(WrtBrowserContainer* page); - void networkRequestFinished(QNetworkReply *reply); void updateJSActions(); void urlChanged(const QUrl &url); void secureStateChange(int); + void processNetworkErrorHappened(const QString & msg); + void processNetworkErrorUrl(const QUrl & url); + void handleLowMemory(); + void handleOutOfMemory(); + void onLoadFinished(bool); + void onDatabaseQuotaExceeded (QWebFrame *,QString); + void onLoadFinishedForBackgroundWindow(bool); signals: + void creatingPage( WRT::WrtBrowserContainer* newPage); void pageCreated( WRT::WrtBrowserContainer* newPage); void pageDeleted( WRT::WrtBrowserContainer* oldPage); void pageChanged( WRT::WrtBrowserContainer* oldPage, WRT::WrtBrowserContainer* newPage ); void titleChanged(const QString &); void loadStarted(); + void initialLayoutCompleted(); void loadProgress( const int progress ); void loadFinished( const bool ok ); + void databaseQuotaExceeded (QWebFrame *,QString); void currentPageIconChanged(); void currentPageUrlChanged( const QUrl & url); void partialUrlChanged(QString url); void unsupportedContent(QNetworkReply *); - void networkRequestStarted(QWebFrame*, QNetworkRequest*); void networkRequestError(QNetworkReply *reply); void sslErrors(QNetworkReply *, const QList<QSslError> &); void showMessageBox(WRT::MessageBoxProxy*); @@ -237,14 +268,29 @@ // All signals for urlsearch void pageLoadStarted(); + void pageLoadFailed(); void pageLoadProgress( const int progress ); void pageLoadFinished( const bool ok ); void pageUrlChanged( const QString str ); void pageIconChanged(); + + // Signal for network status + void networkErrorHappened(const QString & msg ); + + // Signals for low and out of memory + void lowMemory(); + void outOfMemory(); private: - QString partialUrl(const QUrl &url); + bool m_networkError; + QString m_networkErrorMsg; + QString m_networkErrorUrl; + bool m_bErrorUrlMatches; + QString m_promptMsg; + QString m_promptReserved; + LowMemoryHandler *m_memoryHandler; WebPageControllerPrivate * const d; + int m_settingsLoaded; }; -#endif // __WRTPAGEMANAGER_H__ +#endif // __WEBPAGECONTROLLER_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Managers/webpagecontroller_p.h --- a/browsercore/appfw/Api/Managers/webpagecontroller_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Managers/webpagecontroller_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,23 +1,26 @@ /* * 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 __WRTPAGEMANAGER_P_H__ -#define __WRTPAGEMANAGER_P_H__ +#ifndef __WEBPAGECONTROLLER_P_H__ +#define __WEBPAGECONTROLLER_P_H__ #include <QWidget> #include <QAction> @@ -41,7 +44,6 @@ QAction * m_actionStop; QAction * m_actionBack; QAction * m_actionForward; - QAction * m_actionWebInspector; public: WebPageControllerPrivate(WebPageController* qq); @@ -57,4 +59,4 @@ QObject* m_actionsParent; bool donotsaveFlag; }; -#endif // __WRTPAGEMANAGER_P_H__ +#endif // __WEBPAGECONTROLLER_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookMarksHistoryView.h --- a/browsercore/appfw/Api/Views/BookMarksHistoryView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _BOOKMARKS_HISTORY_VIEW_H_ -#define _BOOKMARKS_HISTORY_VIEW_H_ - -#include <QtGui/QTreeView> -#include <QtGui/QWidget> - -#include "BookmarksView.h" - - -namespace WRT { - - class BookmarksHistoryViewPrivate; - class BookmarkNode; - class BookmarksManager; - -class BWF_EXPORT BookmarksHistoryView : public BookmarksView - { - Q_OBJECT - public: - BookmarksHistoryView(BookmarksManager* bm_mgr, QWidget* parent); - ~BookmarksHistoryView(); - QString title(); - static ControllableView *createNew(QWidget *parent); - - signals: - void activated(); - void deactivated(); - - public slots: - void openItem(const QModelIndex &index); - void itemExpanded(const QModelIndex &index); - void itemCollapsed(const QModelIndex &index); - - public slots: //BookmarksView - void activate(); - void deactivate(); - - public: //BookmarksView - QList<QAction*> getContext(); - static const QString Type() { return "bookmarkHistoryView"; } - virtual QString type() const { return Type(); } - - protected: - QWidget* qWidget() const; - virtual QGraphicsWidget* widget() const; - private: - BookmarksHistoryViewPrivate * const dBookmarksHistoryViewPrivate; - - }; - - - -class BWF_EXPORT BookmarksHistoryViewJSObject : public ControllableViewJSObject { - Q_OBJECT - public: - BookmarksHistoryViewJSObject(BookmarksHistoryView* view, QWebFrame* webFrame, const QString& objectName); - ~BookmarksHistoryViewJSObject(); - - - public slots: - - signals: - void done(int); - void activated(); - void deactivated(); - void openUrl(); - - protected: - BookmarksHistoryView * bookMarksHistoryView() { return static_cast<BookmarksHistoryView *>(m_contentView); } - BookmarksHistoryView * bookMarksHistoryViewConst() const { return static_cast<BookmarksHistoryView *>(m_contentView); } - - }; -} -#endif //_BOOKMARKS_HISTORY_VIEW_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksTreeView.cpp --- a/browsercore/appfw/Api/Views/BookmarksTreeView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,354 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QtGui/QHeaderView> -#include <QtCore/QUrl> -#include "BookmarksView_p.h" -#include "BookmarksTreeView_p.h" -#include "BookmarksTreeView.h" -#include "BookmarksManager.h" -#include "bookmarks.h" - -namespace WRT { - -class BookMarkTreeView : public QTreeView - { - public: - BookMarkTreeView(QWidget *parent = 0) ; - bool viewportEvent(QEvent *event); - void update(); - - }; - -class BookmarkProxyWidget : public QGraphicsProxyWidget - { - public: - BookmarkProxyWidget(QTreeView* wid); - void resizeEvent ( QGraphicsSceneResizeEvent * event ); - private: - BookMarkTreeView* m_wid ; - }; - - -BookMarkTreeView::BookMarkTreeView(QWidget *parent) - :QTreeView(parent) -{ -} - -bool BookMarkTreeView::viewportEvent(QEvent* event) -{ - return QTreeView::viewportEvent(event); -} - -void BookMarkTreeView::update() -{ - updateGeometry(); -} - -BookmarkProxyWidget::BookmarkProxyWidget(QTreeView* wid) -{ - m_wid = (BookMarkTreeView*)wid; -} - -void BookmarkProxyWidget::resizeEvent ( QGraphicsSceneResizeEvent * event ) -{ - QRectF r = geometry(); - QRect r1(r.left(),r.top(),r.width(),r.height()); - if(m_wid != NULL){ - m_wid->setGeometry(r1); - m_wid->update(); - } -} - -BookmarksTreeViewPrivate::BookmarksTreeViewPrivate(QWidget *parent) -{ - m_proxyWidget = NULL; - // create the tree view widget - m_treeView = new BookMarkTreeView(parent); - - m_actionBack = new QAction("Back", parent); - - m_treeView->setUniformRowHeights(true); - m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows); - m_treeView->setSelectionMode(QAbstractItemView::SingleSelection); - m_treeView->setEditTriggers(QAbstractItemView::NoEditTriggers); - - m_treeView->setHeaderHidden(true); - m_treeView->setAnimated(true); - - //setting the style sheet for the tree view -#ifndef QT_NO_STYLE_STYLESHEET - m_treeView->setStyleSheet( " QTreeView { \ - background-color : white \ - } \ - QTreeView::branch { \ - border-image: none; image: none \ - } \ - QTreeView::item { \ - height: 28px; \ - } \ - QTreeView::branch:closed:has-children:has-siblings, \ - QTreeView::branch:has-children:!has-siblings:closed { \ - border-image: none;\ - image: url(:/icons/collapsed.png); \ - } \ - QTreeView::branch:open:has-children:has-siblings, \ - QTreeView::branch:open:has-children:!has-siblings { \ - border-image: none;\ - image: url(:/icons/expanded.png);\ - } \ - "); - -#endif -} - - -BookmarksTreeViewPrivate::~BookmarksTreeViewPrivate() -{ - delete(m_treeView); -} - - -/*! - * \class BookmarksTreeView - * - * \brief Derived class of BookmarksView. Implements tree view functionality - * - * This class is implements a tree view of bookmarks - */ - -/*! - * Basic BookmarksTreeView constructor requires a BookmarksManager and - * a parent QWidget - * @param bm_mgr : BookmarksManager Handle - * @param parent : handle to parent widget - * @see BookmarksManager - */ -BookmarksTreeView::BookmarksTreeView(BookmarksManager* bm_mgr, QWidget *parent) : - BookmarksView(bm_mgr, parent), - dBookmarksTreeViewPrivate(new BookmarksTreeViewPrivate(parent)) -{ - dBookmarksTreeViewPrivate->m_bookmarksModel = bookmarksManager()->bookmarksModel(); - dBookmarksTreeViewPrivate->m_treeView->hide(); - m_jsObject = new BookmarksTreeViewJSObject(this, 0, type()); -} - - -/*! - * destructor - */ -BookmarksTreeView::~BookmarksTreeView() -{ - delete dBookmarksTreeViewPrivate; -} - - -/*! - Return the view's Back QAction - @return Action* -*/ -QAction * BookmarksTreeView::getActionBack() -{ - return dBookmarksTreeViewPrivate->m_actionBack; -} - -// SLOTS - -/*! - opens an item in the tree. If is is a bookmark it will emit - the \sa openUrl signal, if it is a folder, it will expand the folder - @param index : handle to modelIndex -*/ -void BookmarksTreeView::openItem(const QModelIndex &index) -{ - const BookmarkNode *node = dBookmarksTreeViewPrivate->m_bookmarksModel->node(index); - - if (!node) - { - return; - } - - if (node->isBookmark()) - { - emit openUrl(QUrl(node->url)); - } - else if (node->isFolder()) - { - expandNodes(node); - } -} - -/*! - opens whatever the current selected item is in the tree. -*/ -void BookmarksTreeView::openCurrentItem() -{ - openItem(dBookmarksTreeViewPrivate->m_treeView->currentIndex()); -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void BookmarksTreeView::activate() -{ - Q_ASSERT(!d->m_isActive); - - dBookmarksTreeViewPrivate->m_treeView->setModel(bookmarksManager()->bookmarksModel()); - - dBookmarksTreeViewPrivate->m_treeView->setExpanded(dBookmarksTreeViewPrivate->m_bookmarksModel->index(0, 0), true); - - expandNodes(bookmarksManager()->bookmarks()); - - bookmarksManager()->setBookMarkView(dBookmarksTreeViewPrivate->m_treeView); - - connect(dBookmarksTreeViewPrivate->m_treeView, SIGNAL(activated(const QModelIndex &)), - this, SLOT(openItem(const QModelIndex &))); - - connect(bookmarksManager(), SIGNAL(bookMarkEntryAdded(BookmarkNode *)), - this, SLOT(entryAdded(BookmarkNode *))); - - // connect the BookmarksTreeViews signals - connect(this, SIGNAL(close()), this, SLOT(deactivate())); - - connect(dBookmarksTreeViewPrivate->m_treeView, SIGNAL(clicked(const QModelIndex &)), - bookmarksManager(), SLOT(updateActions())); - - dBookmarksTreeViewPrivate->m_treeView->show(); - - BookmarkNode *node = bookmarksManager()->bookMarksRoot(); - QModelIndex sourceIndex = bookmarksManager()->bookmarksModel()->index(node); - - //Set the root for treeview - dBookmarksTreeViewPrivate->m_treeView->setRootIndex(sourceIndex); - - - d->m_isActive = true; - - emit activated(); - - dBookmarksTreeViewPrivate->m_treeView->setCurrentIndex ( bookmarksManager()->bookmarksModel()->index(0,0)); - dBookmarksTreeViewPrivate->m_treeView->setFocus(); -} - -/*! - deactivate the view's resources. Could be connected by client to view visibility -*/ -void BookmarksTreeView::deactivate() -{ - Q_ASSERT(d->m_isActive); - - // disconnect signals - disconnect(dBookmarksTreeViewPrivate->m_treeView, SIGNAL(activated(const QModelIndex &)), - this, SLOT(openItem(const QModelIndex &))); - - disconnect(dBookmarksTreeViewPrivate->m_treeView, SIGNAL(clicked(const QModelIndex &)), - bookmarksManager(), SLOT(updateActions())); - - disconnect(this, SIGNAL(close()), this, SLOT(deactivate())); - - bookmarksManager()->setBookMarkView(NULL); - - dBookmarksTreeViewPrivate->m_treeView->hide(); - - - d->m_isActive = false; - - emit deactivated(); -} - -/*! - Return the widget handle of this view -*/ -QWidget* BookmarksTreeView::qWidget() const -{ - return dBookmarksTreeViewPrivate->m_treeView; -} - -/*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc.) (empty for now) -*/ -QList<QAction*> BookmarksTreeView::getContext() -{ - QList<QAction*> contextList; - return contextList; -} - -void BookmarksTreeView::expandNodes(const BookmarkNode *node) -{ - for (int i = 0; i < node->children().count(); ++i) - { - BookmarkNode *childNode = node->children()[i]; - if (childNode->expanded) - { - QModelIndex idx = dBookmarksTreeViewPrivate->m_bookmarksModel->index(childNode); - dBookmarksTreeViewPrivate->m_treeView->setExpanded(idx, true); - expandNodes(childNode); - } - } -} - - -ControllableView* BookmarksTreeView::createNew(QWidget *parent) -{ - return new BookmarksTreeView(BookmarksManager::getSingleton(),parent); -} - - -void BookmarksTreeView::entryAdded(BookmarkNode *node) - { - QModelIndex index = bookmarksManager()->bookmarksModel()->index(node); - dBookmarksTreeViewPrivate->m_treeView->setCurrentIndex ( index ); - - } - - QGraphicsWidget* BookmarksTreeView::widget() const -{ - assert(qWidget()); - if(!dBookmarksTreeViewPrivate->m_proxyWidget) - { - dBookmarksTreeViewPrivate->m_proxyWidget = new BookmarkProxyWidget(dBookmarksTreeViewPrivate->m_treeView); - dBookmarksTreeViewPrivate->m_proxyWidget->setWidget(qWidget()); - } - - return dBookmarksTreeViewPrivate->m_proxyWidget; -} - -BookmarksTreeViewJSObject::BookmarksTreeViewJSObject(BookmarksTreeView* view, QWebFrame* webFrame, const QString& objectName) - : BookmarksViewJSObject(view, webFrame, objectName) -{ - connect(view,SIGNAL(activated()),this,SIGNAL(activated())); - connect(view,SIGNAL(deactivated()),this,SIGNAL(deactivated())); - connect(view,SIGNAL(openUrl(const QUrl &)),this,SIGNAL(openUrl())); -} - -BookmarksTreeViewJSObject::~BookmarksTreeViewJSObject() -{ - BookmarksTreeView * view = static_cast<BookmarksTreeView *>(m_contentView); - disconnect(view,SIGNAL(activated()),this,SIGNAL(activated())); - disconnect(view,SIGNAL(deactivated()),this,SIGNAL(deactivated())); - disconnect(view,SIGNAL(openUrl(const QUrl &)),this,SIGNAL(openUrl())); -} - - -} // namespace WRT - - - - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksTreeView.h --- a/browsercore/appfw/Api/Views/BookmarksTreeView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _BOOKMARKS_TREE_VIEW_H_ -#define _BOOKMARKS_TREE_VIEW_H_ - -#include <QtGui/QTreeView> - -#include "BookmarksView.h" -#include "BWFGlobal.h" - -namespace WRT { - - class BookmarksTreeViewPrivate; - class BookmarkNode; - class BookmarksManager; - class BookmarksModel; - - class BWF_EXPORT BookmarksTreeView : public BookmarksView - { - Q_OBJECT - - public: - BookmarksTreeView(BookmarksManager* bm_mgr, QWidget* parent); - ~BookmarksTreeView(); - QAction* getActionBack(); - - public slots: - void openItem(const QModelIndex &index); - void openCurrentItem(); - - public slots: //BookmarksView - void activate(); - void deactivate(); - void entryAdded(BookmarkNode *node); - - signals: - void activated(); - void deactivated(); - - public: //BookmarksView - QList<QAction*> getContext(); - static const QString Type() { return "bookmarkTreeView"; } - virtual QString type() const { return Type(); } - static ControllableView *createNew(QWidget *parent); - - protected: - QWidget* qWidget() const; - virtual QGraphicsWidget* widget() const; - private: - void expandNodes(const BookmarkNode *node); - - private: - BookmarksTreeViewPrivate * const dBookmarksTreeViewPrivate; - }; - -class BWF_EXPORT BookmarksTreeViewJSObject : public BookmarksViewJSObject { - Q_OBJECT - public: - BookmarksTreeViewJSObject(BookmarksTreeView* view, QWebFrame* webFrame, const QString& objectName); - ~BookmarksTreeViewJSObject(); - - public slots: - - signals: - void activated(); - void deactivated(); - void openUrl(); - - protected: - BookmarksTreeView * bookMarksView() { return static_cast<BookmarksTreeView *>(m_contentView); } - BookmarksTreeView * bookMarksViewConst() const { return static_cast<BookmarksTreeView *>(m_contentView); } - BookmarksManager * bookMarksManager() { - BookmarksTreeView * view = static_cast<BookmarksTreeView *>(m_contentView); - return view->bookmarksManager(); - } - - }; - -} -#endif //_BOOKMARKS_TREE_VIEW_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksTreeView_p.h --- a/browsercore/appfw/Api/Views/BookmarksTreeView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _BOOKMARKS_TREE_VIEW_P_H_ -#define _BOOKMARKS_TREE_VIEW_P_H_ - -#include <QtGui/QTreeView> -#include <QAction> - -namespace WRT { - class BookmarksTreeViewPrivate; - class BookmarkNode; - class BookmarksManager; - class BookmarksModel; - - class BookmarksTreeViewPrivate - { - public: - BookmarksTreeViewPrivate(QWidget *parent); - ~BookmarksTreeViewPrivate(); - QTreeView *m_treeView; - QWidget *m_topLevelWidget; - BookmarksModel *m_bookmarksModel; //not owned - QAction * m_actionBack; - QGraphicsProxyWidget* m_proxyWidget; - }; -} -#endif //_BOOKMARKS_TREE_VIEW_P_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksView.cpp --- a/browsercore/appfw/Api/Views/BookmarksView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - - -#include "BookmarksView.h" -#include "BookmarksView_p.h" -#include "BookmarksManager.h" - - -namespace WRT { - -BookmarksViewPrivate::BookmarksViewPrivate(BookmarksManager* bm_mgr) : - m_bookmarksManager(bm_mgr), - m_isActive(false) -{ - Q_ASSERT(bm_mgr); -} - -BookmarksViewPrivate::~BookmarksViewPrivate() -{ -} - - -/*! - * \class BookmarksView - * - * \brief Base class for bookmarks views - * - * This class is defines the slots and signals used by bookmarks views - */ - -/*! - Basic BookmarksView constructor requires a BookmarksManager and - a parent QWidget - @param bm_mgr : BookmarksManager handle - @param parent : handle to parent widget - @see BookmarksManager -*/ -BookmarksView::BookmarksView(BookmarksManager* bm_mgr, QWidget* parent) : - d(new BookmarksViewPrivate(bm_mgr)) -{ - Q_UNUSED(parent) -} - -/*! - BookmarksView destructor -*/ -BookmarksView::~BookmarksView() -{ - delete d; -} - -/*! - Retrieve the BookmarksManager assigned to this view - @return BookmarksManager Handle - @see BookmarksManager -*/ -BookmarksManager* BookmarksView::bookmarksManager() -{ - return d->m_bookmarksManager; -} - -/*! - Return the title of this view for display - @return Title string -*/ -QString BookmarksView::title() const -{ - return tr("Bookmarks"); -} - -/*! - Return whether the view is active or not -*/ -bool BookmarksView::isActive() -{ - return d->m_isActive; -} - -BookmarksViewJSObject::BookmarksViewJSObject(BookmarksView* view, QWebFrame* webFrame, const QString& objectName) - : ControllableViewJSObject(view, webFrame, objectName) -{ -} - -BookmarksViewJSObject::~BookmarksViewJSObject() -{ -} - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksView.h --- a/browsercore/appfw/Api/Views/BookmarksView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _BOOKMARKS_VIEW_H_ -#define _BOOKMARKS_VIEW_H_ - -#include <QWidget> -#include "controllableviewimpl.h" -#include "BWFGlobal.h" -namespace WRT { - - class BookmarksManager; - class BookmarksViewPrivate; - - class BWF_EXPORT BookmarksView : public ControllableViewBase - { - Q_OBJECT - - public: - BookmarksView(BookmarksManager* bm_mgr, QWidget* parent); - ~BookmarksView(); - - BookmarksManager* bookmarksManager(); - - signals: - void openUrl(const QUrl &url); - void close(); - - public slots: - virtual void activate() = 0; - virtual void deactivate() = 0; - - public: // ControllableView - virtual QString title() const; - virtual bool isActive(); - - protected: - BookmarksViewPrivate * const d; - - //BookmarksManager *m_bookmarksManager; //not owned - }; - - class BWF_EXPORT BookmarksViewJSObject : public ControllableViewJSObject { - Q_OBJECT - public: - BookmarksViewJSObject(BookmarksView* view, QWebFrame* webFrame, const QString& objectName); - ~BookmarksViewJSObject(); - - public slots: - - signals: - void done(int); - - protected: - BookmarksView * bookMarksView() { return static_cast<BookmarksView *>(m_contentView); } - BookmarksView * bookMarksViewConst() const { return static_cast<BookmarksView *>(m_contentView); } - BookmarksManager * bookMarksManager() { - BookmarksView * view = static_cast<BookmarksView *>(m_contentView); - return view->bookmarksManager(); - } - - }; -} - -#endif //_BOOKMARKS_HANDLER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/BookmarksView_p.h --- a/browsercore/appfw/Api/Views/BookmarksView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _BOOKMARKS_VIEW_P_H_ -#define _BOOKMARKS_VIEW_P_H_ - -#include <QWidget> - -namespace WRT { - - class BookmarksManager; - - class BookmarksViewPrivate - { - public: - BookmarksViewPrivate(BookmarksManager* bm_mgr); - ~BookmarksViewPrivate(); - - BookmarksManager *m_bookmarksManager; //not owned - bool m_isActive; - }; -} - -#endif //_BOOKMARKS_VIEW_P_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/GoAnywhereView.cpp --- a/browsercore/appfw/Api/Views/GoAnywhereView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,386 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - - -#include "GoAnywhereView.h" -#include "GoAnywhereViewJSObject.h" -#include "GoAnywhereView_p.h" -#include "wrtbrowsercontainer.h" -#include "WrtPageManager.h" -#include "qwebframe.h" -#include "wrtpage.h" - -#include "qwebhistory.h" -#include "qwebframe.h" -#include "wrtbrowsercontainer.h" -#include "webpagedata.h" -#include "HistoryFlowView.h" - -#include <QButtonGroup> -#include <QGroupBox> -#include <QDebug> -#include <QFileInfo> -#include <QGroupBox> -#include <QHash> -#include <QHBoxLayout> -#include <QLabel> -#include <QMouseEvent> -#include <QPainter> -#include <QPushButton> -#include <QRadioButton> -#include <QVBoxLayout> -#include <QScrollArea> -#include <QTabBar> - - -namespace WRT { -//QString GoAnywhereView::type() const -//{ return d->m_type; } - -GoAnywhereViewPrivate::GoAnywhereViewPrivate(WrtPageManager * pageMgr, - QWidget* parent, - GoAnywhereView* view, - const QString& aType) : - m_widgetParent(parent), - m_pageManager(pageMgr), - m_goAnywhereWidget(new GoAnywhereTabWidget(parent)), - m_isActive(false), - m_currentViewIndex(0), - m_type(aType) -{ - Q_ASSERT(m_pageManager); - Q_UNUSED(view); - m_actionBack = new QAction("Back", m_widgetParent); - m_actionBack->setObjectName("Back"); -} - -// ---------------------------------------------------- -// GoAnywhereWidget -// ---------------------------------------------------- - -GoAnywhereWidget::GoAnywhereWidget(QWidget *parent, GoAnywhereView *view) : QTabWidget(parent), m_view(view) -{ - // setObjectName(QString::fromUtf8("GoAnywhereObj")); -} - -// ---------------------------------------------------- -// GoAnywhereView -// ---------------------------------------------------- - -/*! - * \class GoAnywhereView - * - * \brief The base class for the GoAnywhereViews - * - * This class is responsible for visual aspects of a back page - * - */ - -/*! - Basic GoAnywhereView constructor requires a PageManager to manage the pages - and a parent QWidget - @param pageMgr : PageManager - @param parent : handle to parent widget -*/ - -GoAnywhereView::GoAnywhereView(WrtPageManager * pageMgr, - QWidget* parent,const QString& aType) : - d(new GoAnywhereViewPrivate(pageMgr, parent, this, aType)) -{ - init(); -} - -/*! - * GoAnywhereView destructor -*/ -GoAnywhereView::~GoAnywhereView() -{ - delete d; -} - -/*! - * GoAnywhereView initlization -*/ -void GoAnywhereView::init() -{ - connect(d->m_actionBack, SIGNAL(triggered()), this, SLOT(back())); - connect(d->m_goAnywhereWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); - d->m_goAnywhereWidget->hide(); - m_jsObject = new GoAnywhereViewJSObject(this, 0); -} - - -bool GoAnywhereView::eventFilter(QObject* receiver, QEvent* event) -{ - return false; -} - -/*! - Retrieve the WrtPageManager assigned to this view - @return WrtPageManager* -*/ -WrtPageManager* GoAnywhereView::wrtPageManager() -{ - return d->m_pageManager; -} - -/*! - Return the widget handle of this view - @return QWidget* -*/ -QWidget* GoAnywhereView::qWidget() const -{ - return d->m_goAnywhereWidget; -} - -/*! - Return the title of this view for display - @return QString -*/ -QString GoAnywhereView::title() -{ - return "Go Anywhere View"; -} - -/*! - * Return whether this view is active or not - * @return bool -*/ -bool GoAnywhereView::isActive() -{ - return d->m_isActive; -} - -/*! - * Return the list of public QActions most relevant to the view's current context - * (most approptiate for contextual menus, etc.) - * @return QList<QAction*> -*/ -QList<QAction*> GoAnywhereView::getContext() -{ - // for now, all actions valid at all times - // but there may be some logic here to determine context - QList<QAction*> contextList; - contextList << d->m_actionBack; - return contextList; -} - -/*! - Add a wrt view to the GoAnywhereView - @param view : ControllableView - @param viewId : int -*/ -void GoAnywhereView::addView(ControllableView* view) -{ - d->m_views.push_back(view); - d->m_viewIds.push_back(view->type()); -} - -/*! - Go back from GoAnywhereView view -*/ -void GoAnywhereView::back() -{ - emit ok(0); -} - -/*! - Return the view's Back QAction - For go back to the content view - @return Action* -*/ -QAction * GoAnywhereView::getActionBack() -{ - return d->m_actionBack; -} - -/*! - tabchanged event handler - @param index : int -*/ -void GoAnywhereView::tabChanged(int index) -{ - if (!d->m_isActive) - return; - - //qDebug() << "start tabChanged -- index:" << index; - - //a. deactivate the oldview - ControllableViewQWidgetBase* oldView = static_cast<ControllableViewQWidgetBase*>(d->m_views.at(d->m_currentViewIndex)); - //qDebug() << "oldView" << oldView->title(); - - if (oldView->isActive()) { - //qDebug() << "ssssss1:" << d->m_goAnywhereWidget->count() << index; - oldView->deactivate(); - //qDebug() << "ssssss2:" << d->m_goAnywhereWidget->count() << index; - d->m_goAnywhereWidget->removeTab(d->m_currentViewIndex); // [1] removeTab causes tabChanged() - //qDebug() << "ssssss3:" << d->m_goAnywhereWidget->count() << index; - QString title = oldView->title(); - if (title.indexOf("Window") != -1) - title = "Windows"; - d->m_goAnywhereWidget->insertTab(d->m_currentViewIndex, new QPushButton(d->m_goAnywhereWidget), title); - // Have to reset parent on the widget because tabbed widget sets itself as parent - if(oldView->qWidget()) - oldView->qWidget()->setParent(0); - //qDebug() << "insertTab" << d->m_goAnywhereWidget->count() << index; - } else { - //qDebug() << "removeTab returns"; // be here because of [1] or [2] - return; - } - - //b. activate the newview - //qDebug() << "ssssss4:" << d->m_goAnywhereWidget->count() << index; - - // ControllableView* newView = d->m_views.at(index); - // TODO: Rewrite GoAnyWhere view to use QGraphicsWidget - ControllableViewQWidgetBase* newView = static_cast<ControllableViewQWidgetBase*>(d->m_views.at(index)); - //qDebug() << "newView" << newView->title(); - if (!newView->isActive()) { - newView->activate(); - QString title = newView->title(); - if (title.indexOf("Window") != -1) - title = "Windows"; - d->m_goAnywhereWidget->insertTab(index + 1, newView->qWidget(), title); - } - //qDebug() << "remove empty Tab before:" << d->m_goAnywhereWidget->count() << ":" << index + 1; - QWidget* emptyWidget = d->m_goAnywhereWidget->widget(index); - d->m_goAnywhereWidget->removeTab(index); // [2] removeTab causes tabChanged() - delete emptyWidget; - //qDebug() << "remove empty Tab after:" << d->m_goAnywhereWidget->count(); - d->m_currentViewIndex = index; - emit goAnywhereViewChanged(d->m_viewIds.at(d->m_currentViewIndex)); - //qDebug() << "end of tabchange :) " << d->m_currentViewIndex; -} - -/*! - * Activate the view's resources. Could be connected by client to view visibility -*/ -void GoAnywhereView::activate() -{ - Q_ASSERT(!d->m_isActive); - - d->m_currentViewIndex = 0; - for (int i = 0; i < d->m_views.size(); i++) { - - // TODO: Rewrite GoAnyWhere view to use QGraphicsWidget - // ControllableView* view = d->m_views.at(i); - ControllableViewQWidgetBase* view = static_cast<ControllableViewQWidgetBase*>(d->m_views.at(i)); - QString title = view->title(); - if (title.indexOf("Window") != -1) - title = "Windows"; - if (i == d->m_currentViewIndex) { // only activate first view - view->activate(); - d->m_goAnywhereWidget->addTab(view->qWidget(), title); - } - else - d->m_goAnywhereWidget->addTab(new QPushButton(d->m_goAnywhereWidget), title); - } - - if (d->m_views.size() > 0) { - d->m_goAnywhereWidget->setCurrentIndex(d->m_currentViewIndex); - emit goAnywhereViewChanged(d->m_viewIds.at(d->m_currentViewIndex)); - } - - d->m_isActive = true; - d->m_goAnywhereWidget->show(); -} - -/*! - * Deactivate the view's resources. Could be connected by client to view visibility -*/ -void GoAnywhereView::deactivate() -{ - Q_ASSERT(d->m_isActive); - // cleanup - d->m_isActive = false; - - QVector<QWidget*> trash; - - for (int i = 0; i < d->m_goAnywhereWidget->count(); i++) { - if (i != d->m_currentViewIndex) - trash.push_back(d->m_goAnywhereWidget->widget(i)); - } - - // clear tabwidget - d->m_goAnywhereWidget->clear(); - - // delete empty widget - for (int i = 0; i < trash.size(); ++i) { - delete trash.at(i); - } - - ControllableView* currentView =NULL; - if(d->m_views.count() > 0) { - // deactivate current view - currentView = d->m_views.at(d->m_currentViewIndex); - } - - if (currentView && currentView->isActive()) - { - currentView->deactivate(); - - // Have to reset parent on the widget because tabbed widget sets itself as parent - if(static_cast<ControllableViewQWidgetBase*>(currentView)->qWidget()) - static_cast<ControllableViewQWidgetBase*>(currentView)->qWidget()->setParent(0); - } - - d->m_goAnywhereWidget->hide(); -} - -/*! - Return the central slide rect of the History View - @return QRect -*/ -QRect GoAnywhereView::centralRect() const -{ - if (d->m_views.size() > 0) { - HistoryView* historyView = static_cast<HistoryView*>(d->m_views.at(0)); // FIXME, the first view is HistoryView - - if (historyView) { - QRect r = historyView->centralRect(); - QPoint topLeft = historyView->widget()->parentWidget()->mapToParent(r.topLeft()).toPoint(); - QPoint bottomRight = historyView->widget()->parentWidget()->mapToParent(r.bottomRight()).toPoint(); - qDebug() << r << " vs " << QRect(topLeft, bottomRight); - return QRect(topLeft, bottomRight); - } - } - return QRect(); -} - -/*! - Return the central slide image of the History View - @return QImage -*/ -QImage GoAnywhereView::currentSlide() -{ - if (d->m_views.size() > 0) { - HistoryFlowView* historyView = static_cast<HistoryFlowView*> (d->m_views.at(0)); // FIXME, the first view is HistoryView - - if (historyView) { - return historyView->getCurrentSlide(); - } - } - return QImage(); -} - -ControllableView* GoAnywhereView::createNew(QWidget *parent) -{ - return new GoAnywhereView(WrtPageManager::getSingleton(),parent,GoAnywhereView::Type()); -} - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/GoAnywhereView.h --- a/browsercore/appfw/Api/Views/GoAnywhereView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __GOANYWHEREVIEW_H__ -#define __GOANYWHEREVIEW_H__ - -#include "controllableviewimpl.h" - -#include <QLabel> -#include <QTimer> -#include <QWidget> -#include <QTabWidget> - -class QAction; -class QWidget; -class QScrollArea; - -namespace WRT { - - class WrtPage; - class WrtPageManager; - class GoAnywhereViewPrivate; - class GoAnywhereWidget; - - class BWF_EXPORT GoAnywhereView : public ControllableViewQWidgetBase - { - friend class GoAnywhereWidget; - Q_OBJECT - public: - GoAnywhereView(WrtPageManager* mgr, QWidget* parent,const QString& aType); - ~GoAnywhereView(); - - QAction* getActionBack(); - void setPageInfo(const QUrl& linkUrl, const QUrl& imageUrl); - void showAnimation(bool show); - void setAnimateDirection(const QString& direction); - void setAnimateDuration(int millisecond); - void addView(ControllableView* view); - QRect centralRect() const; - QImage currentSlide(); - static ControllableView *createNew(QWidget *parent); - static const QString Type() { return "goAnywhereView"; } - bool eventFilter(QObject* receiver, QEvent* event); - - signals: - void ok(int ret); - void goAnywhereIsReady(); - void goAnywhereViewChanged(QString viewId); - - void saveBookmarkBtnClicked(); - void viewImageBtnClicked(); - void sendPageBtnClicked(); - void pageSettingBtnClicked(); - - private slots: - void back(); - void tabChanged(int index); - - private: - void init(); - - public: // Pure Virtual from ControllableView - QString title(); - bool isActive(); - QList<QAction*> getContext(); - WrtPageManager* wrtPageManager(); - QString type() const{ return Type(); } - - public slots: // Pure Virtual from ControllableView - void activate(); - void deactivate(); - - protected: - QWidget* qWidget() const; - GoAnywhereViewPrivate * const d; - }; - - class GoAnywhereWidget: public QTabWidget - { - Q_OBJECT - - public: - GoAnywhereWidget(QWidget *parent, GoAnywhereView *view); - - protected: - // void paintEvent(QPaintEvent* event); - // void resizeEvent(QResizeEvent* event); - - private: - GoAnywhereView *m_view; - QScrollArea* m_scrollArea; - QWidget* m_inWidgt; - QLabel* m_pageTileLabel; - QLabel* m_pageUrlLabel; - }; -} -#endif // __GOANYWHEREVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/GoAnywhereViewJSObject.cpp --- a/browsercore/appfw/Api/Views/GoAnywhereViewJSObject.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#include "GoAnywhereViewJSObject.h" -#include "ViewEventContext.h" -#include "GoAnywhereView.h" - -#include <QWebFrame> - -namespace WRT -{ - - -GoAnywhereViewJSObject::GoAnywhereViewJSObject(GoAnywhereView *contentView, QWebFrame *chromeFrame) - : ControllableViewJSObject(contentView, chromeFrame, "goAnywhereView") -{ - connect(contentView,SIGNAL(goAnywhereViewChanged(QString)),this,SIGNAL(goAnywhereViewChanged(QString))); -} - -void GoAnywhereViewJSObject::onContextEvent(ViewEventContext *context){ - QWebFrame *chrome = chromeFrame(); - if(chrome) { - // hab - is this needed? - chrome->addToJavaScriptWindowObject(context->objectName(), context, QScriptEngine::ScriptOwnership); - } - emit contextEvent(context); -} - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/GoAnywhereViewJSObject.h --- a/browsercore/appfw/Api/Views/GoAnywhereViewJSObject.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef GoAnywhereViewJSObject_H_ -#define GoAnywhereViewJSObject_H_ - -#include "BWFGlobal.h" - -#include "controllableviewjsobject.h" - -class ViewEventContext; -namespace WRT -{ - class GoAnywhereView; - - /*! - \brief This class provides the javascript API to GoAnywhereContentViews. - \sa GoAnywhereContentView - */ - class BWF_EXPORT GoAnywhereViewJSObject : public ControllableViewJSObject { - Q_OBJECT - public: - GoAnywhereViewJSObject(GoAnywhereView *contentView, QWebFrame *chromeFrame); - - signals: - void contextEvent(QObject *context); - void goAnywhereViewChanged(QString); - - private slots: - void onContextEvent(ViewEventContext *context); - }; -} - -#endif /* GoAnywhereViewJSObject_H_ */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/GoAnywhereView_p.h --- a/browsercore/appfw/Api/Views/GoAnywhereView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __GOANYWHEREVIEW_P_H__ -#define __GOANYWHEREVIEW_P_H__ - -#include <QAction> -#include <QTabWidget> -#include <QVector> - -class QWidget; -class ControllableView; - -namespace WRT { - class WrtPage; - class WrtPageManager; - class GoAnywhereWidget; - class GoAnywhereView; - - class GoAnywhereTabWidget : public QTabWidget - { - public: - GoAnywhereTabWidget(QWidget* parent) : QTabWidget(parent) {}; - virtual ~GoAnywhereTabWidget() {}; - QTabBar* getTabBar() const { return tabBar(); } - }; - - class GoAnywhereViewPrivate - { - public: - GoAnywhereViewPrivate(WrtPageManager*, QWidget*, GoAnywhereView*,const QString& aType); - ~GoAnywhereViewPrivate() {} - - QWidget* m_widgetParent; - QAction * m_actionBack; - GoAnywhereTabWidget* m_goAnywhereWidget; - bool m_isActive; - WrtPageManager * m_pageManager; // not owned - QVector<ControllableView*> m_views; - QVector<QString> m_viewIds; - int m_currentViewIndex; - QString m_type; - }; -} -#endif // __GOANYWHEREVIEW_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/HistoryFlowView.cpp --- a/browsercore/appfw/Api/Views/HistoryFlowView.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/HistoryFlowView.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,37 +1,50 @@ /* * 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: * */ - #include <QDebug> -#include "WrtPageManager.h" +#include "webpagecontroller.h" #include "HistoryView_p.h" #include "HistoryFlowView.h" #include "PictureFlow.h" -#include "qwebhistory.h" -#include "qwebframe.h" +#include <QWebHistory> +#include <QWebFrame> #include "wrtbrowsercontainer.h" #include "webpagedata.h" namespace WRT { +ControllableView* HistoryFlowView::createNew(QWidget *parent) +{ + return new HistoryFlowView(WebPageController::getSingleton(),parent, Type()); +} + +ControllableViewBase* HistoryFlowView::createNew(QGraphicsWidget *parent) +{ + return new HistoryFlowView(WebPageController::getSingleton(),parent, Type()); +} + /*! * \class HistoryFlowView * @@ -43,12 +56,13 @@ /*! Basic HistoryFlowView constructor requires a PageManager to manage the pages and a parent QWidget - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Widget parent for this class - @see WrtPageManager + @see WebPageController */ -HistoryFlowView::HistoryFlowView(WrtPageManager* mgr, QWidget* parent) : +HistoryFlowView::HistoryFlowView(WebPageController* mgr, QWidget* parent, const QString& aType) : HistoryView(mgr,parent) +, m_type(aType) { m_jsObject = new HistoryViewJSObject(this, 0, type()); } @@ -57,14 +71,16 @@ Basic HistoryFlowView constructor requires a PageManager to manage the pages and a parent QGraphicsWidget Note: This functionality is not yet tested - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Graphics Widget parent for this class - @see WrtPageManager + @see WebPageController */ -HistoryFlowView::HistoryFlowView(WrtPageManager* mgr, QGraphicsWidget* parent) : +HistoryFlowView::HistoryFlowView(WebPageController* mgr, QGraphicsWidget* parent,const QString& aType) : HistoryView(mgr,parent) +, m_type(aType) { +m_jsObject = new HistoryViewJSObject(this, 0, type()); } /*! @@ -72,7 +88,10 @@ */ void HistoryFlowView::activate() { - d->m_flowInterface = new GraphicsPictureFlow(d->m_widgetParent); + if (!d->m_flowInterface) { + d->m_flowInterface = new GraphicsPictureFlow(d->m_widgetParent); + emit instantiated(this); + } HistoryView::activate(); } @@ -99,9 +118,4 @@ return pf->slide(pf->centerIndex()); } -ControllableView* HistoryFlowView::createNew(QWidget *parent) -{ - return new HistoryFlowView(WrtPageManager::getSingleton(),parent); -} - } // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/HistoryFlowView.h --- a/browsercore/appfw/Api/Views/HistoryFlowView.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/HistoryFlowView.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,50 +1,55 @@ /* * 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 __HISTORYFLOWVIEW_H__ #define __HISTORYFLOWVIEW_H__ #include <QObject> #include <QAction> #include "HistoryView.h" +#include "controllableview.h" class QWebHistory; +class WebPageController; namespace WRT { - class WrtPageManager; - class BWF_EXPORT HistoryFlowView : public HistoryView { Q_OBJECT public: - HistoryFlowView(WrtPageManager * mgr, QWidget* parent); - HistoryFlowView(WrtPageManager * mgr, QGraphicsWidget* parent); + HistoryFlowView(WebPageController * mgr, QWidget* parent,const QString& aType); + HistoryFlowView(WebPageController * mgr, QGraphicsWidget* parent,const QString& aType); + virtual QString type() const { return m_type; } + + static const QString Type() { return "HistoryView"; } + static ControllableView *createNew(QWidget *parent); + static ControllableViewBase *createNew(QGraphicsWidget* parent); + QImage getCurrentSlide(); -// static const QString Type() { return "HistoryFlowView"; } - static const QString Type() { return "historyView"; } - virtual QString type() const { return Type(); } - - static ControllableView *createNew(QWidget *parent); - public slots: void activate(); void setCenterIndex(int i); + protected: + QString m_type; }; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/HistoryView.cpp --- a/browsercore/appfw/Api/Views/HistoryView.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/HistoryView.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,30 +1,33 @@ /* * 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: * */ - -#include "WrtPageManager.h" +#include "webpagecontroller.h" #include "FlowInterface.h" #include "HistoryView_p.h" #include "HistoryView.h" #include "HistoryViewEventContext.h" -#include "qwebhistory.h" -#include "qwebframe.h" +#include <QWebHistory> +#include <QWebFrame> #include "wrtbrowsercontainer.h" #include "webpagedata.h" #include "scriptobjects.h" @@ -33,7 +36,7 @@ namespace WRT { -HistoryViewPrivate::HistoryViewPrivate(WrtPageManager * pageMgr, +HistoryViewPrivate::HistoryViewPrivate(WebPageController * pageMgr, QWidget* parent) : m_flowInterface(0), m_widgetParent(parent), @@ -47,7 +50,7 @@ init(); } -HistoryViewPrivate::HistoryViewPrivate(WrtPageManager * pageMgr, +HistoryViewPrivate::HistoryViewPrivate(WebPageController * pageMgr, QGraphicsWidget* parent) : m_flowInterface(0), m_widgetParent(0), @@ -97,7 +100,7 @@ Basic HistoryView constructor requires a PageManager to manage the pages and a parent QWidget */ -HistoryView::HistoryView(WrtPageManager * pageMgr, +HistoryView::HistoryView(WebPageController * pageMgr, QWidget* parent) : d(new HistoryViewPrivate(pageMgr, parent)) { @@ -107,7 +110,7 @@ Basic HistoryView constructor requires a PageManager to manage the pages and a parent QGraphicsWidget */ -HistoryView::HistoryView(WrtPageManager * pageMgr, +HistoryView::HistoryView(WebPageController * pageMgr, QGraphicsWidget* parent) : d(new HistoryViewPrivate(pageMgr, parent)) { @@ -120,9 +123,9 @@ } /*! - Retrieve the WrtPageManager assigned to this view + Retrieve the WebPageController assigned to this view */ -WrtPageManager* HistoryView::wrtPageManager() +WebPageController* HistoryView::webPageController() { return d->m_pageManager; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/HistoryView.h --- a/browsercore/appfw/Api/Views/HistoryView.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/HistoryView.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __HISTORYVIEW_H__ #define __HISTORYVIEW_H__ @@ -23,15 +26,15 @@ #include <QGraphicsWidget> #include <QAction> #include <QString> -#include "qwebframe.h" +#include <QWebFrame> #include "controllableviewimpl.h" class QWebHistory; +class WebPageController; namespace WRT { class WrtBrowserContainer; - class WrtPageManager; class FlowInterface; class HistoryViewPrivate; @@ -39,10 +42,10 @@ { Q_OBJECT public: - HistoryView(WrtPageManager * mgr, QWidget* parent); - HistoryView(WrtPageManager * mgr, QGraphicsWidget* parent); + HistoryView(WebPageController * mgr, QWidget* parent); + HistoryView(WebPageController * mgr, QGraphicsWidget* parent); ~HistoryView(); - WrtPageManager* wrtPageManager(); + WebPageController* webPageController(); public: // public actions available for this view QAction * getActionForward(); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/HistoryView_p.h --- a/browsercore/appfw/Api/Views/HistoryView_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/HistoryView_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __HISTORYVIEW_P_H__ #define __HISTORYVIEW_P_H__ @@ -24,10 +27,10 @@ #include <QAction> class QWebHistory; +class WebPageController; namespace WRT { class WrtBrowserContainer; - class WrtPageManager; class GraphicsFlowInterface; class HistoryViewPrivate @@ -39,15 +42,15 @@ QAction * m_actionCancel; public: - HistoryViewPrivate(WrtPageManager * mgr, QWidget* parent); - HistoryViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent); + HistoryViewPrivate(WebPageController * mgr, QWidget* parent); + HistoryViewPrivate(WebPageController * mgr, QGraphicsWidget* parent); ~HistoryViewPrivate(); GraphicsFlowInterface * m_flowInterface; QWidget * m_widgetParent; QGraphicsWidget * m_graphicsWidgetParent; - WrtPageManager * m_pageManager; // not owned + WebPageController * m_pageManager; // not owned WrtBrowserContainer * m_activePage; // not owned int m_historyIndex; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageFlowView.cpp --- a/browsercore/appfw/Api/Views/ImageFlowView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - - - -#include "ImageFlowView.h" -#include "ImageView_p.h" -#include "PictureFlow.h" - -#include <QDebug> - -namespace WRT { - -/*! - * \class ImageFlowView - * - * \brief presents the page images in the "Flow" style - * - * This class is responsible for.... - */ - -/*! - Basic ImageFlowView constructor requires a PageManager to manage the pages - and a parent QWidget - @param mgr : WrtPageManager Handle for this class - @param parent : widget parent handle for this class - @see WrtPageManager -*/ -ImageFlowView::ImageFlowView(WrtPageManager* mgr, QWidget* parent) : - ImageView(mgr,parent) -{ -} - -/*! - Basic ImageFlowView constructor requires a PageManager to manage the pages - and a parent QGraphicsWidget - @param mgr : WrtPageManager Handle for this class - @param parent : Graphics widget parent handle for this class - @see WrtPageManager -*/ -ImageFlowView::ImageFlowView(WrtPageManager* mgr, QGraphicsWidget* parent) : - ImageView(mgr,parent) -{ -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void ImageFlowView::activate() -{ - d->m_flowInterface = new PictureFlow(d->m_widgetParent); - ImageView::activate(); -} - -/*! - set the history view's center index - @param i : index to which the view's center has to be set -*/ -void ImageFlowView::setCenterIndex(int i) -{ - ImageView::setCenterIndex(i); - PictureFlow * pf = static_cast<PictureFlow*>(d->m_flowInterface); - pf->showSlide(i); -} - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageFlowView.h --- a/browsercore/appfw/Api/Views/ImageFlowView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __IMAGEFLOWVIEW_H__ -#define __IMAGEFLOWVIEW_H__ - -#include <QObject> -#include <QAction> -#include "ImageView.h" - -class QWebHistory; - -namespace WRT { - - class WrtPageManager; - - class BWF_EXPORT ImageFlowView : public ImageView - { - Q_OBJECT - public: - ImageFlowView(WrtPageManager * mgr, QWidget* parent); - ImageFlowView(WrtPageManager * mgr, QGraphicsWidget* parent); - static const QString Type() { return "ImageFlowView"; } - virtual QString type() const { return Type(); } - - public slots: - void activate(); - void setCenterIndex(int i); - }; - -} -#endif // __IMAGEFLOWVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageLiteView.cpp --- a/browsercore/appfw/Api/Views/ImageLiteView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - - - -#include "ImageLiteView.h" -#include "ImageView_p.h" -#include "VisualFlowLite.h" - -#include <QDebug> - -namespace WRT { - -/*! - * \class ImageLiteView - * - * \brief presents the page images in the "Lite" style - * - * This class is responsible for.... - */ - -/*! - Basic ImageLiteView constructor requires a PageManager to manage the pages - and a parent QWidget - @param mgr : WrtPageManager Handle for this class - @param parent : widget parent handle for this class - @see WrtPageManager -*/ -ImageLiteView::ImageLiteView(WrtPageManager* mgr, QWidget* parent) : - ImageView(mgr,parent) -{ -} - -/*! - Basic ImageLiteView constructor requires a PageManager to manage the pages - and a parent QGraphicsWidget - @param mgr : WrtPageManager Handle for this class - @param parent : Graphics widget parent handle for this class - @see WrtPageManager -*/ -ImageLiteView::ImageLiteView(WrtPageManager* mgr, QGraphicsWidget* parent) : - ImageView(mgr,parent) -{ -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void ImageLiteView::activate() -{ - d->m_flowInterface = new VisualFlowLite(d->m_widgetParent); - ImageView::activate(); -} - -/*! - set the history view's center index - @param i : index to which the view's center has to be set -*/ -void ImageLiteView::setCenterIndex(int i) -{ - ImageView::setCenterIndex(i); - VisualFlowLite * vf = static_cast<VisualFlowLite*>(d->m_flowInterface); - vf->setCenterThumbnail(i); -} - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageLiteView.h --- a/browsercore/appfw/Api/Views/ImageLiteView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __IMAGELITEVIEW_H__ -#define __IMAGELITEVIEW_H__ - -#include <QObject> -#include <QAction> -#include "ImageView.h" -#include "controllableview.h" - -class QWebHistory; - -namespace WRT { - - class WrtPageManager; - - class BWF_EXPORT ImageLiteView : public ImageView - { - Q_OBJECT - public: - ImageLiteView(WrtPageManager * mgr, QWidget* parent); - ImageLiteView(WrtPageManager * mgr, QGraphicsWidget* parent); - static const QString Type() { return "ImageLiteView"; } - virtual QString type() const { return Type(); } - - public slots: - void activate(); - void setCenterIndex(int i); - }; - -} -#endif // __IMAGELITEVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageView.cpp --- a/browsercore/appfw/Api/Views/ImageView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,451 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QStack> -#include <qpainter.h> -#include "WrtPageManager.h" -#include "FlowInterface.h" -#include "ImageView_p.h" -#include "ImageView.h" - -#include "qwebhistory.h" -#include "qwebframe.h" -#include "qwebelement.h" -#include "wrtbrowsercontainer.h" -#include "webpagedata.h" - -#include <QDebug> - - -#define NO_IMAGE -1 -#define IMAGE_ALT "alt" -#define IMAGE_SOURCE "src" - -namespace WRT { - -ImageViewPrivate::ImageViewPrivate(WrtPageManager * mgr, QWidget* parent) : - m_flowInterface(0), - m_widgetParent(parent), - m_graphicsWidgetParent(0), - m_pageManager(mgr), - m_imageIndex(0), - m_activePage(0), - m_isActive(false) -{ - Q_ASSERT(m_pageManager); - init(); -} - -ImageViewPrivate::ImageViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent) : - m_flowInterface(0), - m_widgetParent(0), - m_graphicsWidgetParent(parent), - m_pageManager(mgr), - m_imageIndex(0), - m_activePage(0), - m_isActive(false) -{ - Q_ASSERT(m_pageManager); - init(); -} - -ImageViewPrivate::~ImageViewPrivate() -{ -} - -void ImageViewPrivate::init() -{ - // create the view's actions - m_actionForward = new QAction("Forward",m_widgetParent); - m_actionForward->setObjectName("Forward"); - m_actionBack = new QAction("Back",m_widgetParent); - m_actionBack->setObjectName("Back"); - m_actionOK = new QAction("OK",m_widgetParent); - m_actionOK->setObjectName("OK"); - m_actionCancel = new QAction("Cancel",m_widgetParent); - m_actionCancel->setObjectName("OK"); -} - -/*! - * \class ImageView - * - * \brief The base class for the ImageViews - * - * This class is responsible for.... - */ - -/*! - Basic ImageView constructor requires a PageManager to manage the pages - and a parent QWidget -*/ -ImageView::ImageView(WrtPageManager * pageMgr, QWidget* parent) : - d(new ImageViewPrivate(pageMgr, parent)) -{ - // always trigger an update to track the images regardless of whether active or not - connect(d->m_pageManager, SIGNAL(loadFinished(bool)), this, SLOT(updateImageList(bool))); -} - -/*! - Basic ImageView constructor requires a PageManager to manage the pages - and a parent QGraphicsWidget -*/ -ImageView::ImageView(WrtPageManager * pageMgr, QGraphicsWidget* parent) : - d(new ImageViewPrivate(pageMgr, parent)) -{ - // always trigger an update to track the images regardless of whether active or not - connect(d->m_pageManager, SIGNAL(loadFinished(bool)), this, SLOT(updateImageList(bool))); -} - - -ImageView::~ImageView() -{ - delete d; -} - -/*! - Retrieve the WrtPageManager assigned to this view -*/ -WrtPageManager* ImageView::wrtPageManager() -{ - return d->m_pageManager; -} - -/*! - Update image list. This is automatically called when a page loads - regardless of if the view is active or not. -*/ -void ImageView::updateImageList(bool ok) -{ - d->m_activePage = d->m_pageManager->currentPage(); - - if(!d->m_activePage) - return; - - // reset image list - d->m_imageList.clear(); - - // walk the tree of images to fetch all available images on a page. - QStack<QWebFrame*> stackOfFrames; - stackOfFrames.push(d->m_activePage->mainFrame()); - while( !stackOfFrames.isEmpty()) - { - QWebFrame* f = stackOfFrames.pop(); - - foreach( QWebElement element, - f->findAllElements( "img" )) - { - bool found = false; - QRect r = element.geometry(); - if( r.size().isEmpty()) - { - continue; - } - - QString imgsrc = element.attribute( IMAGE_SOURCE ); - - if( imgsrc.isEmpty()) - found = true; // do not add empty image in any case - else - { - foreach( QImage c_img,d->m_imageList ) - { - if( imgsrc == c_img.text( IMAGE_SOURCE )) - { - found = true; - break; - } - } - - } - - if( !found ) - { - QImage img( element.geometry().size(),QImage::Format_RGB32 ); - QPainter p( static_cast<QPaintDevice *>(&img) ); -#if defined CWRTINTERNALWEBKIT - f->renderElement( &p,element,QPoint( 0,0 )); -// fixme. implementation is in QtWebKit ToT, not yet in QtWebKit 4.6 beta -// #elif QT_VERSION >= 0x040600 - // element.render(&p); -#endif - img.setText( IMAGE_SOURCE,imgsrc ); - img.setText( IMAGE_ALT,element.attribute( IMAGE_ALT )); - d->m_imageList.append( img ); - } - } - - foreach (QWebFrame *child, f->childFrames()) - stackOfFrames.push(child); - } - - // IF we're active, update the visible image list - if(d->m_flowInterface && d->m_isActive) - refreshFlowInterface(); -} - - -/*! - Return the widget handle of this view -*/ -QWidget* ImageView::qWidget() const -{ - return d->m_flowInterface; -} - -/*! - Return the title of this view for display -*/ -QString ImageView::title() -{ - return QString("ImageView"); -} - -/*! - Return whether this view is active or not -*/ -bool ImageView::isActive() -{ - return d->m_isActive; -} - - -/*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc. -*/ -QList<QAction*> ImageView::getContext() -{ - // for now, all actions valid at all times - // but there may be some logic here to determine context - QList<QAction*> contextList; - contextList << - d->m_actionForward << - d->m_actionBack << - d->m_actionOK << - d->m_actionCancel; - return contextList; -} - -/*! - Get the current image from the flow interface -*/ -QImage ImageView::getCurrent() const -{ - int index = d->m_flowInterface->centerIndex(); - QImage img(d->m_flowInterface->slide(index)); - if(!img.isNull()) - return img; - return QImage(); -} - -/*! - Get the current image count (valid even if view is not active) -*/ -int ImageView::getCurrentImageCount() -{ - return d->m_imageList.count(); -} - -/*! - Return the view's Forward QAction - For scrolling the history view forwards -*/ -QAction * ImageView::getActionForward() -{ - return d->m_actionForward; -} - -/*! - Return the view's Back QAction - For scrolling the history view backwards -*/ -QAction * ImageView::getActionBack() -{ - return d->m_actionBack; -} - -/*! - Return the view's OK QAction - For invoking the view's OK -*/ -QAction * ImageView::getActionOK() -{ - return d->m_actionOK; -} - -/*! - Return the view's Cancel QAction - For invoking the view's Cancel -*/ -QAction * ImageView::getActionCancel() -{ - return d->m_actionCancel; -} - -void ImageView::refreshFlowInterface() -{ - if(!d->m_flowInterface) - return; - - // clear - d->m_flowInterface->clear(); - if (d->m_imageList.count() > 0) { - for (int i=0; i < d->m_imageList.count(); i++) - d->m_flowInterface->addSlide(d->m_imageList.at(i)); - - d->m_flowInterface->setCenterIndex(0); - centerIndexChanged(0); - } - updateActions(0); -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void ImageView::activate() -{ - Q_ASSERT(!d->m_isActive); - - if(!d->m_flowInterface) - return; - - d->m_flowInterface->init(); - - // now forward visual flow lite's signals - connect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), SIGNAL(centerIndexChanged(int))); - connect(d->m_flowInterface, SIGNAL(ok(int)), this, SLOT(chooseImage(int))); - connect(d->m_flowInterface, SIGNAL(cancel()), this, SIGNAL(cancel())); - - // internally process the index change signal as well - connect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), this, SLOT(updateActions(int))); - - // auto-link relevant actions to slots - connect(d->m_actionForward, SIGNAL(triggered()), this, SLOT(forward())); - connect(d->m_actionBack, SIGNAL(triggered()), this, SLOT(back())); - - // show and set index - d->m_imageIndex = 0; - d->m_isActive = true; - - // finally update the images at the end (will also update the interface) just before showing - updateImageList(true); - d->m_flowInterface->show(); -} - -/*! - deactivate the view's resources. Could be connected by client to view visibility -*/ -void ImageView::deactivate() -{ - Q_ASSERT(d->m_isActive); - - if(!d->m_flowInterface) - return; - - // disconnect signals - disconnect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), this, SIGNAL(centerIndexChanged(int))); - disconnect(d->m_flowInterface, SIGNAL(ok(int)), this, SLOT(chooseImage(int))); - disconnect(d->m_flowInterface, SIGNAL(cancel()), this, SIGNAL(cancel())); - - // internally process the index change signal as well - disconnect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), this, SLOT(updateActions(int))); - - // auto-link relevant actions to slots - disconnect(d->m_actionForward, SIGNAL(triggered()), this, SLOT(forward())); - disconnect(d->m_actionBack, SIGNAL(triggered()), this, SLOT(back())); - - // cleanup - d->m_flowInterface->deleteLater(); - d->m_flowInterface = NULL; - d->m_isActive = false; -} - -/*! - set the history view's center index -*/ -void ImageView::setCenterIndex(int index) -{ - // first emit center index change - //emit centerIndexChanged(index); - - d->m_imageIndex = index - d->m_activePage->history()->currentItemIndex(); - QWebHistoryItem item = d->m_activePage->history()->itemAt(d->m_imageIndex); - QString title; - if (item.isValid()) { - title = item.title(); - if (title.isNull() || title.isEmpty()) { - title = item.url().toString(); - } - } - emit titleChanged(title); - emit centerIndexChanged(index); -} - -/*! - scroll forward in the view -*/ -void ImageView::forward() -{ - if(!d->m_flowInterface) - return; - - d->m_flowInterface->showNext(); -} - -/*! - scroll back in the view -*/ -void ImageView::back() -{ - if(!d->m_flowInterface) - return; - - d->m_flowInterface->showPrevious(); -} - -void ImageView::updateActions(int centerIndex) -{ - d->m_actionBack->setEnabled(centerIndex != 0); - d->m_actionForward->setEnabled(centerIndex < (d->m_activePage->history()->count() - 1)); -} - - - -void ImageView::chooseImage(int index) -{ - QImage img(d->m_flowInterface->slide(index)); - if(!img.isNull()) - emit ok(img); -} - -/*! - \fn void ImageView::centerIndexChanged(int index); - emitted when the center index changed -*/ - -/*! - \fn void ImageView::ok(QImage img); - emitted when the ok action has occured, contains history index at the time of close -*/ - -/*! - \fn void ImageView::cancel(); - emitted when the cancel action has occured -*/ - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageView.h --- a/browsercore/appfw/Api/Views/ImageView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __IMAGEVIEW_H__ -#define __IMAGEVIEW_H__ - -#include <QWidget> -#include <QGraphicsWidget> -#include <QAction> -#include "controllableviewimpl.h" - -class QWebHistory; - -namespace WRT { - - class WrtBrowserContainer; - class WrtPageManager; - class FlowInterface; - class ImageViewPrivate; - - class BWF_EXPORT ImageView : public ControllableViewQWidgetBase - { - Q_OBJECT - public: - ImageView(WrtPageManager * mgr, QWidget* parent); - ImageView(WrtPageManager * mgr, QGraphicsWidget* parent); - ~ImageView(); - WrtPageManager* wrtPageManager(); - QImage getCurrent() const; - int getCurrentImageCount(); - - public: // public actions available for this view - QAction * getActionForward(); - QAction * getActionBack(); - QAction * getActionOK(); - QAction * getActionCancel(); - - - public: // Pure Virtual from ControllableView - QString title(); - bool isActive(); - QList<QAction*> getContext(); - - private: - void refreshFlowInterface(); - - signals: - void centerIndexChanged(int index); - void ok(QImage img); - void cancel(); - - public slots: - void activate(); - void deactivate(); - void setCenterIndex(int i); - void forward(); - void back(); - - private slots: - void updateActions(int centerIndex); - void chooseImage(int index); - void updateImageList(bool status); - - protected: - QWidget* qWidget() const; - ImageViewPrivate * const d; - }; -} -#endif // __IMAGEVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ImageView_p.h --- a/browsercore/appfw/Api/Views/ImageView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __IMAGEVIEW_P_H__ -#define __IMAGEVIEW_P_H__ - -#include <QWidget> -#include <QGraphicsWidget> -#include <QAction> - -class QWebHistory; - -namespace WRT { - - class WrtBrowserContainer; - class WrtPageManager; - class FlowInterface; - - class ImageViewPrivate - { - public: // public actions available for this view - QAction * m_actionForward; - QAction * m_actionBack; - QAction * m_actionOK; - QAction * m_actionCancel; - - public: - ImageViewPrivate(WrtPageManager * mgr, QWidget* parent); - ImageViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent); - ~ImageViewPrivate(); - - FlowInterface* m_flowInterface; - QWidget * m_widgetParent; - QGraphicsWidget * m_graphicsWidgetParent; - - WrtPageManager* m_pageManager; - int m_imageIndex; - WrtBrowserContainer* m_activePage; - QList<QImage> m_imageList; - - bool m_isActive; - - private: - void init(); - - }; -} -#endif // __IMAGEVIEW_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ThumbnailView.cpp --- a/browsercore/appfw/Api/Views/ThumbnailView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,265 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - - -#include "WrtPageManager.h" -#include "ThumbnailView_p.h" -#include "ThumbnailView.h" -#include "TnEngineHandler.h" -#include "TnEngineView.h" -#include "wrtbrowsercontainer.h" - -#include <QDebug> - -namespace WRT { -ThumbnailViewPrivate::ThumbnailViewPrivate(WrtPageManager * mgr, QWidget* parent) : - m_widgetParent(parent), - m_graphicsWidgetParent(0), - m_pageManager(mgr), - m_activePage(0), - m_tnEngineHandler(0), - m_tnEngineView(0), - m_isActive(false) -{ - Q_ASSERT(m_pageManager); - init(); -} - -ThumbnailViewPrivate::ThumbnailViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent) : - m_widgetParent(0), - m_graphicsWidgetParent(parent), - m_pageManager(mgr), - m_activePage(0), - m_tnEngineHandler(0), - m_tnEngineView(0), - m_isActive(false) -{ - Q_ASSERT(m_pageManager); - init(); -} - -ThumbnailViewPrivate::~ThumbnailViewPrivate() -{ -} - -void ThumbnailViewPrivate::init() -{ - // create the view's actions - m_actionOK = new QAction("OK",m_widgetParent); - m_actionOK->setObjectName("OK"); - m_actionCancel = new QAction("Cancel",m_widgetParent); - m_actionCancel->setObjectName("Cancel"); -} - -/*! - * \class ThumbnailView - * - * \brief The Thumbnail View - * - * This class provides an overview of the current page, allows the user to scroll to - * a different part of the page - */ - -/*! - Basic ThumbnailView constructor requires a PageManager to manage the pages - and a parent QWidget -*/ -ThumbnailView::ThumbnailView(WrtPageManager * pageMgr, QWidget* parent) : - d(new ThumbnailViewPrivate(pageMgr, parent)) -{ -} - -/*! - Basic ThumbnailView constructor requires a PageManager to manage the pages - and a parent QGraphicsWidget -*/ -ThumbnailView::ThumbnailView(WrtPageManager * pageMgr, QGraphicsWidget* parent) : - d(new ThumbnailViewPrivate(pageMgr, parent)) -{ -} - - -ThumbnailView::~ThumbnailView() -{ - if(d->m_isActive) - deactivate(); - - if(d->m_tnEngineHandler) - delete(d->m_tnEngineHandler); - - if(d->m_tnEngineView) - delete(d->m_tnEngineView); - - delete d; -} - -/*! - Retrieve the WrtPageManager assigned to this view -*/ -WrtPageManager* ThumbnailView::wrtPageManager() -{ - return d->m_pageManager; -} - -/*! - Return the view's OK QAction - For invoking the view's OK -*/ -QAction * ThumbnailView::getActionOK() -{ - return d->m_actionOK; -} - -/*! - Return the view's Cancel QAction - For invoking the view's Cancel -*/ -QAction * ThumbnailView::getActionCancel() -{ - return d->m_actionCancel; -} - -/*! - Return the widget handle of this view -*/ -QWidget* ThumbnailView::qWidget() const -{ - return d->m_tnEngineHandler->widget(); -} - -/*! - Return the title of this view for display -*/ -QString ThumbnailView::title() -{ - return QString("ThumbnailView"); -} - -/*! - Return whether this view is active or not -*/ -bool ThumbnailView::isActive() -{ - return d->m_isActive; -} - - -/*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc. -*/ -QList<QAction*> ThumbnailView::getContext() -{ - // for now, all actions valid at all times - // but there may be some logic here to determine context - QList<QAction*> contextList; - contextList << - d->m_actionOK << - d->m_actionCancel; - return contextList; -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void ThumbnailView::activate() -{ - Q_ASSERT(!d->m_isActive); - - d->m_tnEngineHandler = new TnEngineHandler(d->m_pageManager, d->m_widgetParent); - Q_ASSERT(d->m_tnEngineHandler); - d->m_tnEngineView = d->m_tnEngineHandler->tnEngineView(); - Q_ASSERT(d->m_tnEngineView); - - // connect/forward signals as appropriate - connect(d->m_tnEngineView,SIGNAL(scrollStarted()),this,SIGNAL(scrollStarted())); - connect(d->m_tnEngineView,SIGNAL(scrollBy(int,int)),this,SIGNAL(scrollBy(int,int))); - connect(d->m_tnEngineView,SIGNAL(scrollEnded()),this,SIGNAL(scrollEnded())); - connect(d->m_tnEngineHandler,SIGNAL(ok(int,int)),this,SIGNAL(ok(int,int))); - connect(d->m_tnEngineView,SIGNAL(cancel()),this,SIGNAL(cancel())); - - //d->m_tnEngineHandler->show(); - d->m_isActive = true; - -} - -/*! - deactivate the view's resources. Could be connected by client to view visibility -*/ -void ThumbnailView::deactivate() -{ - Q_ASSERT(d->m_isActive); - - Q_ASSERT(d->m_tnEngineHandler); - Q_ASSERT(d->m_tnEngineView); - - // connect/forward signals as appropriate - disconnect(d->m_tnEngineView,SIGNAL(scrollStarted()),this,SIGNAL(scrollStarted())); - disconnect(d->m_tnEngineView,SIGNAL(scrollBy(int,int)),this,SIGNAL(scrollBy(int,int))); - disconnect(d->m_tnEngineView,SIGNAL(scrollEnded()),this,SIGNAL(scrollEnded())); - disconnect(d->m_tnEngineHandler,SIGNAL(ok(int,int)),this,SIGNAL(ok(int,int))); - disconnect(d->m_tnEngineView,SIGNAL(cancel()),this,SIGNAL(cancel())); - - m_proxyWidget->setWidget(0); - delete m_proxyWidget; - m_proxyWidget = 0; - delete(d->m_tnEngineHandler); - d->m_tnEngineHandler = NULL; - d->m_tnEngineView = NULL; - - d->m_isActive = false; -} - -/*! - scroll the ThumbnailView by the amount given the doc coordinates -*/ -void ThumbnailView::scrollViewBy(int /*x*/, int /*y*/) -{ - Q_ASSERT(d->m_tnEngineHandler); - Q_ASSERT(d->m_tnEngineView); - d->m_tnEngineHandler->updateNow(); - d->m_tnEngineView->update(); -} - -/*! - \fn void ThumbnailView::scrollStarted(); - emitted when scrolling on the ThumbnailView has started -*/ - -/*! - \fn void ThumbnailView::scrollTo(int x, int y); - emitted during a scrolling event -*/ - -/*! - \fn void ThumbnailView::scrollEnded(); - emitted when scrolling has ended(); -*/ - -/*! - \fn void ThumbnailView::ok(int x, int y); - emitted when the ok action has occured, and the position the - view has currently scrolled to -*/ - -/*! - \fn void ThumbnailView::cancel(); - emitted when the cancel action has occured -*/ - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ThumbnailView.h --- a/browsercore/appfw/Api/Views/ThumbnailView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __THUMBNAILVIEW_H__ -#define __THUMBNAILVIEW_H__ - -#include <QWidget> -#include <QGraphicsWidget> -#include <QAction> -#include "controllableviewimpl.h" - -namespace WRT { - - class WrtBrowserContainer; - class WrtPageManager; - class TnEngineHandler; - class TnEngineView; - class ThumbnailViewPrivate; - - class BWF_EXPORT ThumbnailView : public ControllableViewQWidgetBase - { - Q_OBJECT - public: - ThumbnailView(WrtPageManager * mgr, QWidget* parent); - ThumbnailView(WrtPageManager * mgr, QGraphicsWidget* parent); - ~ThumbnailView(); - - WrtPageManager* wrtPageManager(); - - public: // public actions available for this view - QAction * getActionOK(); - QAction * getActionCancel(); - - public: // Pure Virtual from ControllableView - - QString title(); - bool isActive(); - QList<QAction*> getContext(); - static const QString Type() { return "ImageFlowView"; } - virtual QString type() const { return Type(); } - - signals: - void scrollStarted(); - void scrollBy(int x, int y); - void scrollEnded(); - void ok(int x, int y); - void cancel(); - - public slots: - void activate(); - void deactivate(); - void scrollViewBy(int, int); - - protected: - QWidget* qWidget() const; - private: - ThumbnailViewPrivate * const d; - }; -} -#endif // __THUMBNAILVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/ThumbnailView_p.h --- a/browsercore/appfw/Api/Views/ThumbnailView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __THUMBNAILVIEW_P_H__ -#define __THUMBNAILVIEW_P_H__ - -#include <QWidget> -#include <QGraphicsWidget> -#include <QAction> - -namespace WRT { - - class WrtBrowserContainer; - class WrtPageManager; - class TnEngineHandler; - class TnEngineView; - - class ThumbnailViewPrivate - { - public: // public actions available for this view - QAction * m_actionOK; - QAction * m_actionCancel; - - public: - ThumbnailViewPrivate(WrtPageManager * mgr, QWidget* parent); - ThumbnailViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent); - ~ThumbnailViewPrivate(); - - QWidget * m_widgetParent; - QGraphicsWidget * m_graphicsWidgetParent; - WrtPageManager* m_pageManager; - WrtBrowserContainer* m_activePage; - TnEngineHandler * m_tnEngineHandler; - TnEngineView * m_tnEngineView; - bool m_isActive; - - private: - void init(); - }; -} -#endif // __THUMBNAILVIEW_P_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/Views.pri --- a/browsercore/appfw/Api/Views/Views.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/Views.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,23 +1,24 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # HEADERS += \ - $$PWD/webcontentview.h \ - $$PWD/BookmarksView_p.h \ - $$PWD/BookmarksView.h \ $$PWD/controllableview.h \ $$PWD/controllableviewimpl.h \ $$PWD/controllableviewjsobject.h \ @@ -32,13 +33,8 @@ SOURCES += \ $$PWD/controllableviewimpl.cpp \ $$PWD/controllableviewjsobject.cpp \ - $$PWD/webcontentview.cpp \ - $$PWD/BookmarksView.cpp \ $$PWD/HistoryView.cpp \ $$PWD/HistoryFlowView.cpp \ $$PWD/WindowFlowView.cpp \ $$PWD/WindowView.cpp \ $$PWD/mostvisitedpagestore.cpp - -RESOURCES += \ - $$PWD/views.qrc diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WidgetView.cpp --- a/browsercore/appfw/Api/Views/WidgetView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,227 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "../../webkit/WebCore/platform/SharedTimer.h" - -#include <QDebug> -#include <QObject> -#include <QMenu> - -#include "WidgetView_p.h" -#include "WidgetView.h" -#include "WrtPageManager.h" -#include "wrtbrowsercontainer.h" - - -namespace WRT { - -WidgetViewPrivate::WidgetViewPrivate(WrtPageManager * mgr, QWidget* parent) : - m_pageManager(mgr), - m_widgetParent(parent), - m_graphicsWidgetParent(0), - m_isActive(false) -{ - // Verify/Create Page Manager - Q_ASSERT(m_pageManager); -} - -WidgetViewPrivate::WidgetViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent) : - m_pageManager(mgr), - m_widgetParent(0), - m_graphicsWidgetParent(parent), - m_isActive(false) -{ - // Verify/Create Page Manager - Q_ASSERT(m_pageManager); -} - -WidgetViewPrivate::~WidgetViewPrivate() -{ -} - -/*! - * \class WidgetView - * - * \brief the public view for web widget application content - * - * This class is responsible for.... - */ - -/*! - Basic WidgetView constructor requires a PageManager to manage the pages - and a parent QWidget - @param mgr : WrtPageManager handle for this class - @param parent : Widget parent for this class - @see WrtPageManager -*/ -WidgetView::WidgetView(WrtPageManager * mgr, QWidget* parent) : - d(new WidgetViewPrivate(mgr,parent)) -{ -} - -/*! - Basic WidgetView constructor requires a PageManager to manage the pages - and a parent QGraphicsWidget - Note: This functionality is not yet tested - @param mgr : WrtPageManager handle for this class - @param parent : Graphics Widget parent for this class - @see WrtPageManager - -*/ -WidgetView::WidgetView(WrtPageManager * mgr, QGraphicsWidget* parent) : - d(new WidgetViewPrivate(mgr,parent)) -{ -} - -WidgetView::~WidgetView() -{ - delete d; -} - -/*! - Retrieve the WrtPageManager associated with this ContentView - @return : WrtPageManager handle for this page -*/ -WrtPageManager * WidgetView::wrtPageManager() -{ - return d->m_pageManager; -} - -/*! - Show the current web widget -*/ -void WidgetView::show() -{ - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - - if (currPage) - { - currPage->webWidget()->show(); - currPage->widgetContainer()->notifyWidget(WRT::WidgetContainer::WrtWidgetOnshow); - // start shared timers - currPage->deferTimers(false); - } -} - -/*! - Hide the current web widget -*/ -void WidgetView::hide() -{ - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - if (currPage) - { - currPage->webWidget()->hide(); - currPage->widgetContainer()->notifyWidget(WRT::WidgetContainer::WrtWidgetOnhide); - // stop shared timers - currPage->deferTimers(true); - } -} - -/*! - Return the web widgets qt widget handle of this view - @return : Widget handle for this class -*/ -QWidget* WidgetView::widget() -{ - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - Q_ASSERT(currPage); - QWidget * webWidget = currPage->webWidget(); - return webWidget; -} - -/*! - Return the title of this view for display - @return : Title string -*/ -QString WidgetView::title() -{ - return d->m_pageManager->title(); -} - -/*! - Tests if this view is active or not - @return true if view is active else false -*/ -bool WidgetView::isActive() -{ - return d->m_isActive; -} - -/*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc.) - @return : list of pulicactions for this view. -*/ -QList<QAction*> WidgetView::getContext() -{ - // for now, just return all actions, add logic throughout later - QList<QAction*> contextList; - return contextList; -} - -QMenu* WidgetView::getMenu() -{ - QMenu* menu = NULL; - - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - if (currPage) - { - WidgetContainer* widgetContainer = currPage->widgetContainer(); - if ( widgetContainer) - menu = widgetContainer->menu(); - } - - return menu; -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void WidgetView::activate() -{ - Q_ASSERT(!d->m_isActive); - - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - Q_ASSERT(currPage); - - QWidget * webWidget = currPage->webWidget(); - webWidget->setParent(d->m_widgetParent); - webWidget->resize(d->m_widgetParent->size()); - - d->m_isActive = true; -} - -/*! - deactivate the view's resources. Could be connected by client to view visibility -*/ -void WidgetView::deactivate() -{ - Q_ASSERT(d->m_isActive); - - WrtBrowserContainer * currPage = d->m_pageManager->currentPage(); - if (currPage) - { - currPage->webWidget()->hide(); - currPage->widgetContainer()->notifyWidget(WRT::WidgetContainer::WrtWidgetOnhide); - } - - d->m_isActive = false; -} - -} // namespace WRT diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WidgetView.h --- a/browsercore/appfw/Api/Views/WidgetView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __WIDGETVIEW_H__ -#define __WIDGETVIEW_H__ - -#include <QWidget> -#include <QGraphicsWidget> -#include "controllableviewimpl.h" - -namespace WRT { - - class WrtPageManager; - class WrtBrowserContainer; - class WidgetViewPrivate; - - class BWF_EXPORT WidgetView : public ControllableViewQWidgetBase - { - Q_OBJECT - //public: // public actions available for this view - - public: - WidgetView(WrtPageManager * mgr, QWidget* parent); - WidgetView(WrtPageManager * mgr, QGraphicsWidget* parent); - ~WidgetView(); - WrtPageManager * wrtPageManager(); - QMenu* getMenu(); - - public slots: - void hide(); - void show(); - - public: // Pure Virtual from ControllableView - QWidget* widget(); - QString title(); - bool isActive(); - QList<QAction*> getContext(); - - public slots: // Pure Virtual from ControllableView - void activate(); - void deactivate(); - - private: - WidgetViewPrivate * const d; - }; -} - -#endif // __CONTENTVIEW_H__ - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WidgetView_p.h --- a/browsercore/appfw/Api/Views/WidgetView_p.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __WIDGETVIEW_P_H__ -#define __WIDGETVIEW_P_H__ - -#include <QWidget> -#include <QGraphicsWidget> - -namespace WRT { - - class WrtPageManager; - class WrtBrowserContainer; - - class WidgetViewPrivate - { - public: - WidgetViewPrivate(WrtPageManager * mgr, QWidget* parent); - WidgetViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent); - ~WidgetViewPrivate(); - - WrtPageManager * m_pageManager; - QWidget * m_widgetParent; - QGraphicsWidget * m_graphicsWidgetParent; - - bool m_isActive; - }; -} - -#endif // __WIDGETVIEW_P_H__ - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WindowFlowView.cpp --- a/browsercore/appfw/Api/Views/WindowFlowView.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/WindowFlowView.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,31 +1,34 @@ /* * 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: * */ - #include <QDebug> -#include "WrtPageManager.h" +#include "webpagecontroller.h" #include "WindowView_p.h" #include "WindowFlowView.h" #include "FilmstripFlow.h" -#include "qwebhistory.h" -#include "qwebframe.h" +#include <QWebHistory> +#include <QWebFrame> #include "wrtbrowsercontainer.h" #include "webpagedata.h" @@ -33,13 +36,13 @@ ControllableView* WindowFlowView::createNew(QWidget* parent) { - return new WindowFlowView( WRT::WrtPageManager::getSingleton(), parent, Type()); + return new WindowFlowView( WebPageController::getSingleton(), parent, Type()); } ControllableViewBase* WindowFlowView::createNew(QGraphicsWidget* parent) { - return new WindowFlowView( WRT::WrtPageManager::getSingleton(), parent, Type()); + return new WindowFlowView( WebPageController::getSingleton(), parent, Type()); } @@ -56,10 +59,10 @@ Basic WindowFlowView constructor requires a PageManager to manage the pages and a parent QWidget - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Widget parent for this class */ -WindowFlowView::WindowFlowView(WrtPageManager* mgr, QWidget* parent,const QString& aType) : +WindowFlowView::WindowFlowView(WebPageController* mgr, QWidget* parent,const QString& aType) : WindowView(mgr,parent) , m_type(aType) { @@ -70,11 +73,11 @@ Basic WindowFlowView constructor requires a PageManager to manage the pages and a parent QGraphicsWidget Note: This functionality is not yet tested - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Graphics Widget parent for this class - @see WrtPageManager + @see WebPageController */ -WindowFlowView::WindowFlowView(WrtPageManager* mgr, QGraphicsWidget* parent,const QString& aType) : +WindowFlowView::WindowFlowView(WebPageController* mgr, QGraphicsWidget* parent,const QString& aType) : WindowView(mgr,parent) , m_type(aType) { diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WindowFlowView.h --- a/browsercore/appfw/Api/Views/WindowFlowView.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/WindowFlowView.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __WINDOWFLOWVIEW_H__ #define __WINDOWFLOWVIEW_H__ @@ -25,17 +28,17 @@ #include "controllableview.h" class QWebWindow; +class WebPageController; namespace WRT { - class WrtPageManager; class BWF_EXPORT WindowFlowView : public WindowView { Q_OBJECT public: - WindowFlowView(WrtPageManager * mgr, QWidget* parent,const QString& aType); - WindowFlowView(WrtPageManager * mgr, QGraphicsWidget* parent,const QString& aType); + WindowFlowView(WebPageController * mgr, QWidget* parent,const QString& aType); + WindowFlowView(WebPageController * mgr, QGraphicsWidget* parent,const QString& aType); virtual QString type() const { return m_type; } static const QString Type() { return "WindowView" ;} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WindowView.cpp --- a/browsercore/appfw/Api/Views/WindowView.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/WindowView.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,70 +1,64 @@ /* * 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - -#include "WrtPageManager.h" +#include "webpagecontroller.h" #include "FlowInterface.h" #include "WindowView_p.h" #include "WindowView.h" -#include "qwebhistory.h" -#include "qwebframe.h" +#include <QWebHistory> +#include <QWebFrame> #include "wrtbrowsercontainer.h" -#include "webcontentview.h" #include "webpagedata.h" #include <QDebug> +#define WINDOWVIEW_TIME_TO_TRANSITION 200 +#define WINDOWVIEW_TIME_TO_ADD_NEXTPAGE 100 #define WINDOWVIEW_MAX_NUM_WINDOWS 5 namespace WRT { -WindowViewPrivate::WindowViewPrivate(WrtPageManager * pageMgr, +WindowViewPrivate::WindowViewPrivate(WebPageController * pageMgr, QWidget* parent) : m_flowInterface(0), m_widgetParent(parent), m_graphicsWidgetParent(0), m_pageManager(pageMgr), - m_activePage(0), - m_state(0), - m_animateTimer(0), - m_animateCount(0), - m_newCenterPage(NULL), - m_newPageIndex(-1), - m_blankWindowImg(NULL) + m_mode(0), + m_state(0) { Q_ASSERT(m_pageManager); init(); } -WindowViewPrivate::WindowViewPrivate(WrtPageManager * pageMgr, +WindowViewPrivate::WindowViewPrivate(WebPageController * pageMgr, QGraphicsWidget* parent) : m_flowInterface(0), m_widgetParent(0), m_graphicsWidgetParent(parent), m_pageManager(pageMgr), - m_activePage(0), - m_state(0), - m_animateTimer(0), - m_animateCount(0), - m_newCenterPage(NULL), - m_newPageIndex(-1), - m_blankWindowImg(NULL) + m_mode(0), + m_state(0) { Q_ASSERT(m_pageManager); init(); @@ -72,33 +66,34 @@ WindowViewPrivate::~WindowViewPrivate() { - + delete m_transTimer; } void WindowViewPrivate::init() { // create the view's actions - m_actionForward = new QAction("Forward", m_widgetParent); + m_actionForward = new QAction("Forward", m_graphicsWidgetParent); m_actionForward->setObjectName("Forward"); - m_actionBack = new QAction("Back", m_widgetParent); + m_actionBack = new QAction("Back", m_graphicsWidgetParent); m_actionBack->setObjectName("Back"); - m_actionOK = new QAction("OK", m_widgetParent); + m_actionOK = new QAction("OK", m_graphicsWidgetParent); m_actionOK->setObjectName("OK"); - m_actionCancel = new QAction("Cancel", m_widgetParent); + m_actionCancel = new QAction("Cancel", m_graphicsWidgetParent); m_actionCancel->setObjectName("Cancel"); - m_actionAddWindow = new QAction("addWindow", m_widgetParent); + m_actionGoBack = new QAction("goBack", m_graphicsWidgetParent); + m_actionGoBack->setObjectName("goBack"); + m_actionGoBack->setEnabled(true); + + m_actionAddWindow = new QAction("addWindow", m_graphicsWidgetParent); m_actionAddWindow->setObjectName("addWindow"); - m_actionDelWindow = new QAction("delWindow", m_widgetParent); + m_actionDelWindow = new QAction("delWindow", m_graphicsWidgetParent); m_actionDelWindow->setObjectName("delWindow"); - // create animate timer, not single shot - m_animateTimer = new QTimer(m_widgetParent); - } /*! @@ -107,7 +102,7 @@ * \brief The base class for the WindowViews * * This class provides the basic routines to enable navigation amoung multiple pages - * known by WrtPageManager. + * known by WebPageController. * * Derived classes (such as WindowFlowView, and WindowLiteView) supply * the exact "FlowInterface" to be used, and rely on much of the base-class functionality @@ -119,10 +114,10 @@ Basic WindowView constructor requires a PageManager to manage the pages and a parent QWidget - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Widget parent for this class */ -WindowView::WindowView(WrtPageManager * pageMgr, +WindowView::WindowView(WebPageController * pageMgr, QWidget* parent) : d(new WindowViewPrivate(pageMgr, parent)) { @@ -134,11 +129,11 @@ and a parent QGraphicsWidget Note: This functionality is not yet tested - @param mgr : WrtPageManager handle for this class + @param mgr : WebPageController handle for this class @param parent : Graphics Widget parent for this class - @see WrtPageManager + @see WebPageController */ -WindowView::WindowView(WrtPageManager * pageMgr, +WindowView::WindowView(WebPageController * pageMgr, QGraphicsWidget* parent) : d(new WindowViewPrivate(pageMgr, parent)) { @@ -152,9 +147,9 @@ } /*! - Retrieve the WrtPageManager assigned to this view + Retrieve the WebPageController assigned to this view */ -WrtPageManager* WindowView::wrtPageManager() +WebPageController* WindowView::webPageController() { return d->m_pageManager; } @@ -243,7 +238,7 @@ { QString pagetitle(d->m_pageList->at(centerIndex)->mainFrame()->title()); if(pagetitle.isEmpty()) - title += qtTrId("txt_browser_windows_blank"); + title += qtTrId("txt_browser_windows_new_window"); else title += pagetitle; } @@ -274,6 +269,7 @@ contextList << d->m_actionForward << d->m_actionBack << + d->m_actionGoBack << d->m_actionOK << d->m_actionCancel << d->m_actionAddWindow << @@ -303,6 +299,13 @@ connect(d->m_flowInterface, SIGNAL(cancel()), this, SIGNAL(cancel())); connect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), this, SLOT(changedCenterIndex(int))); connect(d->m_flowInterface, SIGNAL(removed(int)), this, SLOT(delPage(int))); + connect(d->m_transTimer, SIGNAL(timeout()), this, SLOT(endAnimation())); + + if (d->m_mode == WindowViewModeTransition ) { + + //qDebug() << "Connect to pageCreated " ; + connect(d->m_pageManager, SIGNAL(creatingPage(WRT::WrtBrowserContainer*)), this, SLOT(onPageCreated(WRT::WrtBrowserContainer*))); + } // FIXME: temporal fix the resize & performance issue caused by the new QGraphicsItem architecture widget()->installEventFilter(this); @@ -319,6 +322,7 @@ */ void WindowView::deactivate() { + //qDebug() << "deactivate " << d->m_mode; Q_ASSERT(d->m_state == WindowViewActive); if(!d->m_flowInterface) @@ -331,7 +335,13 @@ // internally process the index change signal as well disconnect(d->m_flowInterface, SIGNAL(centerIndexChanged(int)), this, SLOT(changedCenterIndex(int))); disconnect(d->m_flowInterface, SIGNAL(removed(int)), this, SLOT(delPage(int))); + disconnect(d->m_transTimer, SIGNAL(timeout()), this, SLOT(endAnimation())); + if (d->m_mode == WindowViewModeTransition ) { + //qDebug() << "========Disconnect pageCreated "; + disconnect(d->m_pageManager, SIGNAL(creatingPage(WRT::WrtBrowserContainer*)), this, SLOT(onPageCreated(WRT::WrtBrowserContainer*))); + // Check if new pages list is empty - assert d->m_newPages.count() + } widget()->removeEventFilter(this); // Hide and delete flowinterface later when told @@ -347,11 +357,15 @@ d->m_flowInterface->deleteLater(); d->m_flowInterface = NULL; + d->m_mode = WindowViewModeNormal; d->m_state = WindowViewNotActive; + } void WindowView::init() { + d->m_transTimer = new QTimer(this); + // auto-link relevant actions to slots connect(d->m_actionForward, SIGNAL(triggered()), this, SLOT(forward())); connect(d->m_actionBack, SIGNAL(triggered()), this, SLOT(back())); @@ -361,6 +375,11 @@ connect(d->m_actionDelWindow, SIGNAL(triggered()), this, SLOT(delPage())); } +void WindowView::setMode(Mode m) +{ + d->m_mode = m; +} + void WindowView::setSize(QSize& size) { d->m_windowViewSize = size; @@ -418,6 +437,16 @@ QWebHistoryItem item = window->history()->currentItem(); WebPageData data = item.userData().value<WebPageData>(); QImage img = data.m_thumbnail; + + QSize size = window->webWidget()->size().toSize(); + QSize imgSize = img.size(); + float ratio = (float)size.width() / (float)size.height(); + float imgRatio = (float)imgSize.width() / (float)imgSize.height(); + if (imgRatio != ratio) { + size.scale(imgSize, Qt::KeepAspectRatio); + img = img.copy(0, 0, size.width(), size.height()); + } + d->m_flowInterface->addSlide(img, title); } setCenterIndex(d->m_pageManager->currentPage()); @@ -488,13 +517,19 @@ void WindowView::indexChangeInActiveState(int index) { - WrtBrowserContainer* page = d->m_pageList->at(index); - d->m_pageManager->setCurrentPage(page); + if (d->m_mode == WindowViewModeNormal ) { + WrtBrowserContainer* page = d->m_pageList->at(index); + d->m_pageManager->setCurrentPage(page); + + /* Set the new page as the center page */ + emit centerIndexChanged(index); - /* Set the new page as the center page */ - emit centerIndexChanged(index); - - updateActions(); + updateActions(); + } + else { + //qDebug() << "Start Adding pages " << "Pages in list" << d->m_newPages.count() << "Page added " << d->m_newPages.at(0); + addPage(d->m_newPages.takeFirst()); + } } @@ -544,29 +579,34 @@ } } -void WindowView::pageLoadCplt(bool ok) -{ -} - -void WindowView::addPage() +void WindowView::addPage(WrtBrowserContainer* pg) { Q_ASSERT(d->m_flowInterface); - //if (d->m_widgetParent) { - if (d->m_flowInterface->slideAnimationOngoing() || d->m_state == WindowViewAddPage) + //qDebug() << "WindowView::addPage: COUNT "<< d->m_newPages.count(); + if (d->m_flowInterface->slideAnimationOngoing() || (d->m_mode == WindowViewModeNormal && d->m_state == WindowViewAddPage)) return; - if (d->m_pageList->count() >= WINDOWVIEW_MAX_NUM_WINDOWS) { - return; - } - d->m_state = WindowViewAddPage; // insert an empty image after index - // the insert function will activate the add-page animation which is build-in in FilmstripFlow - QImage emptyImage; + // the insert function will activate the add-page animation which is built-in in FilmstripFlow + QImage img; + QString title= ""; + if (pg && !pg->mainFrame()->requestedUrl().isEmpty() ) { + if (!pg->mainFrame()->title().isEmpty()) + title = pg->mainFrame()->title(); + else if (!pg->mainFrame()->url().isEmpty() ) + title = d->m_pageManager->partialUrl(pg->mainFrame()->url()); + else + title = d->m_pageManager->partialUrl(pg->mainFrame()->requestedUrl()); + + //qDebug() << "WindowView::addPage - Title " << pg->mainFrame()->title() << "Url : "<< pg->mainFrame()->url().toString()<< "Requested Url : " << pg->mainFrame()->requestedUrl().toString() ; + } + int index = d->m_flowInterface->centerIndex(); - d->m_flowInterface->insert(index + 1, emptyImage, ""); + d->m_flowInterface->insert(index + 1, img, title); + updateActions(); } @@ -575,20 +615,59 @@ /* Adding a new page is completed when the index reaches the newly added index*/ Q_ASSERT(d->m_state == WindowViewAddPage); - connect(d->m_flowInterface, SIGNAL(endAnimationCplt()), this, SLOT(addPageCplt())); + + //qDebug() << " WindowView::addPageCplt: index " << index << "add new page" << d->m_newPages.count(); + /* If new pages were added, show them before transitioning back to content view */ + if (d->m_newPages.count() ) { + + //qDebug() << " WindowView::addPageCplt: index " << index << "add new page" << d->m_newPages.count(); + QTimer::singleShot(WINDOWVIEW_TIME_TO_ADD_NEXTPAGE, this, SLOT(addNextPage())); + + } + else { + connect(d->m_flowInterface, SIGNAL(endAnimationCplt()), this, SLOT(addPageCplt())); + + // Start a timer so that the new blank window is shown before transition starts + d->m_transTimer->start(WINDOWVIEW_TIME_TO_TRANSITION); + + } + + emit pageAdded(); +} + +void WindowView::addNextPage() +{ + //qDebug() << " WindowView::addNextPage " << d->m_newPages.count() << "Added Page " << d->m_newPages.at(0); + addPage(d->m_newPages.takeFirst()); +} + +void WindowView::endAnimation() +{ + + //qDebug() << "WindowView::endAnimation "; + d->m_transTimer->stop(); d->m_flowInterface->runEndAnimation(); + } void WindowView::addPageCplt() { - // open a new page - QWebPage* pg = d->m_pageManager->openPage(); + //qDebug() << "WindowView::addPageCplt() " << d->m_newPages.count(); + if (d->m_mode == WindowViewModeNormal ) { + // open a new page + WRT::WrtBrowserContainer* pg = d->m_pageManager->openPage(); + } int index = d->m_flowInterface->centerIndex(); emit centerIndexChanged(index); disconnect(d->m_flowInterface, SIGNAL(endAnimationCplt()), this, SLOT(addPageCplt())); d->m_state = WindowViewActive; updateActions(); + + if (d->m_mode == WindowViewModeTransition ) { + emit newWindowTransitionComplete(); + } + emit addPageComplete(); } @@ -630,70 +709,35 @@ emit centerIndexChanged(d->m_flowInterface->centerIndex()); } -QRect WindowView::centralRect() -{ - if(!d->m_flowInterface) - return QRect(); + +void WindowView::onPageCreated(WRT::WrtBrowserContainer *pg) { - return d->m_flowInterface->centralRect(); + //qDebug() << "WindowView::onPageCreated" << pg << "Trans Timer active " << d->m_transTimer->isActive(); + if (d->m_transTimer->isActive()) { + // Stop that timer and add the new page + d->m_transTimer->stop(); + addPage(pg); + } + else { + + d->m_newPages.append(pg); + } +} +int WindowView::pageCount() { + + return (d->m_flowInterface->slideCount()); } -QImage WindowView::currentSlide() -{ - QImage img; - if ( d->m_flowInterface) { - img = d->m_flowInterface->slide(d->m_flowInterface->centerIndex()); - } - return img; -} +int WindowView::currentPageIndex() { -void WindowView::setBlankWindowImg(QImage * img) -{ - d->m_blankWindowImg = img; -} - -void WindowView::hideWidget() -{ - d->m_flowInterface->hide(); - d->m_flowInterface->deleteLater(); - d->m_flowInterface = NULL; -} - -void WindowView::showWidget() -{ - d->m_flowInterface->show(); + return (d->m_flowInterface->centerIndex()); } WindowViewJSObject:: WindowViewJSObject(WindowView* view, QWebFrame* webFrame, const QString& objectName) : ControllableViewJSObject(view, webFrame, objectName) { - connect(view,SIGNAL(ok(WrtBrowserContainer*)),this,SLOT(ok(WrtBrowserContainer*))); - connect(view,SIGNAL(addPageComplete()),this,SLOT(addPageComplete())); - connect(view,SIGNAL(centerIndexChanged(int)),this,SLOT(changedCenterIndex(int))); - -} - -WindowViewJSObject::~WindowViewJSObject() -{ - disconnect(windowView(),SIGNAL(ok(WrtBrowserContainer*)),this,SLOT(ok(WrtBrowserContainer*))); - disconnect(windowView(),SIGNAL(addPageComplete()),this,SLOT(addPageComplete())); - disconnect(windowView(),SIGNAL(centerIndexChanged(int)),this,SLOT(changedCenterIndex(int))); - -} + connect(view,SIGNAL(pageAdded()),this,SIGNAL(pageAdded())); -void WindowViewJSObject::addPageComplete() -{ - emit pageAdded(); -} - -void WindowViewJSObject::changedCenterIndex(int index) -{ - emit centerIndexChanged(index); -} - -void WindowViewJSObject::ok(WrtBrowserContainer * page) -{ - emit done(page); } /*! diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WindowView.h --- a/browsercore/appfw/Api/Views/WindowView.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/WindowView.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __WINDOWVIEW_H__ #define __WINDOWVIEW_H__ @@ -25,11 +28,11 @@ #include "controllableviewimpl.h" class QWebHistory; +class WebPageController; namespace WRT { class WrtBrowserContainer; - class WrtPageManager; class WindowViewPrivate; class BWF_EXPORT WindowView : public ControllableViewBase @@ -43,8 +46,14 @@ WindowViewDeletePage, WindowViewInvalid }; - WindowView(WrtPageManager * mgr, QWidget* parent); - WindowView(WrtPageManager * mgr, QGraphicsWidget* parent); + + enum Mode { + WindowViewModeNormal, + WindowViewModeTransition + }; + + WindowView(WebPageController * mgr, QWidget* parent); + WindowView(WebPageController * mgr, QGraphicsWidget* parent); ~WindowView(); virtual void show() { @@ -55,7 +64,7 @@ widget()->hide(); } - WrtPageManager* wrtPageManager(); + WebPageController* webPageController(); public: // public actions available for this view QAction * getActionForward(); @@ -65,13 +74,10 @@ QAction * getActionAddWindow(); QAction * getActionDelWindow(); - QRect centralRect(); - QImage currentSlide(); - void setBlankWindowImg(QImage * img); - void hideWidget(); - void showWidget(); void setSize(QSize& size); + void setMode(Mode mode); + public: // Pure Virtual from ControllableView QString title() const; bool isActive(); @@ -79,12 +85,17 @@ void displayModeChanged(QString& newMode); QGraphicsWidget* widget() const; + int pageCount(); + int currentPageIndex(); + signals: void centerIndexChanged(int index); void ok(WrtBrowserContainer * newPage); void cancel(); void animateComplete(); void addPageComplete(); + void newWindowTransitionComplete(); + void pageAdded(); public slots: void activate(); @@ -92,6 +103,7 @@ void forward(); void back(); void updateWindows(); + void onPageCreated(WRT::WrtBrowserContainer*); void animate(WrtBrowserContainer *, WrtBrowserContainer*); @@ -100,13 +112,14 @@ void updateActions(); void okTriggered(int index); void okTriggeredCplt(); - void pageLoadCplt(bool ok); - void addPage(); + void addPage(WrtBrowserContainer* pg= NULL); void addPageCplt(int); void addPageCplt(); void delPage(); void delPage(int); void delPageCplt(int); + void endAnimation(); + void addNextPage(); private: void init(); @@ -125,22 +138,18 @@ Q_OBJECT public: WindowViewJSObject(WindowView* view, QWebFrame* webFrame, const QString& objectName); - ~WindowViewJSObject(); - + + Q_SIGNALS: + void pageAdded(); - public slots: - void ok(WrtBrowserContainer * newPage); - void addPageComplete(); - void changedCenterIndex(int); - - signals: - void done(WrtBrowserContainer * newPage); - void pageAdded(); - void centerIndexChanged(int index); - + public Q_SLOTS: + int pageCount(){ return windowView()->pageCount();} + int currentPageIndex(){ return windowView()->currentPageIndex();} protected: WindowView * windowView() { return static_cast<WindowView *>(m_contentView); } WindowView * windowViewConst() const { return static_cast<WindowView *>(m_contentView); } + + }; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/WindowView_p.h --- a/browsercore/appfw/Api/Views/WindowView_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/WindowView_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __WINDOWVIEW_P_H__ #define __WINDOWVIEW_P_H__ @@ -24,11 +27,12 @@ #include <QAction> #include <QTimer> +class QTimer; class QWebHistory; +class WebPageController; namespace WRT { class WrtBrowserContainer; - class WrtPageManager; class GraphicsFlowInterface; class WindowViewPrivate @@ -36,35 +40,32 @@ public: // public actions available for this view QAction * m_actionForward; QAction * m_actionBack; + QAction * m_actionGoBack; QAction * m_actionOK; QAction * m_actionCancel; QAction * m_actionAddWindow; QAction * m_actionDelWindow; public: - WindowViewPrivate(WrtPageManager * mgr, QWidget* parent); - WindowViewPrivate(WrtPageManager * mgr, QGraphicsWidget* parent); + WindowViewPrivate(WebPageController * mgr, QWidget* parent); + WindowViewPrivate(WebPageController * mgr, QGraphicsWidget* parent); ~WindowViewPrivate(); GraphicsFlowInterface * m_flowInterface; QWidget * m_widgetParent; QGraphicsWidget * m_graphicsWidgetParent; - WrtPageManager * m_pageManager; // not owned - WrtBrowserContainer * m_activePage; // not owned - - int m_state; - - QTimer * m_animateTimer; - int m_animateCount; - WrtBrowserContainer * m_newCenterPage; + WebPageController * m_pageManager; // not owned + QTimer* m_transTimer; QList<WrtBrowserContainer*>* m_pageList; + QList<WrtBrowserContainer*> m_newPages; - int m_newPageIndex; - QImage * m_blankWindowImg; QSize m_windowViewSize; + int m_mode; + int m_state; + private: void init(); }; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/bookmarkshistoryview.cpp --- a/browsercore/appfw/Api/Views/bookmarkshistoryview.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QtCore/QUrl> -#include "BookMarksHistoryView.h" -#include "BookmarksManager.h" -#include "bookmarks.h" -#include "BookmarksView_p.h" - -#define COLUMN0_EXPANDED_WIDTH 165 -#define COLUMN0_NORMAL_WIDTH 145 - -namespace WRT { - -class HistoryTreeView : public QTreeView - { - public: - HistoryTreeView(QWidget *parent = 0); - bool viewportEvent(QEvent *event); - void update(); - }; - - -class HistoryProxyWidget : public QGraphicsProxyWidget - { - public: - HistoryProxyWidget(QTreeView* wid); - void resizeEvent ( QGraphicsSceneResizeEvent * event ); - private: - HistoryTreeView* m_wid ; - }; - - -class BookmarksHistoryViewPrivate - { - public: - BookmarksHistoryViewPrivate(QWidget *parent); - ~BookmarksHistoryViewPrivate(); - QTreeView *m_treeView; - HistoryModel *m_historyModel; //not owned - QGraphicsProxyWidget* m_proxyWidget; - - }; - -HistoryTreeView::HistoryTreeView(QWidget *parent) - :QTreeView(parent) -{ -} -bool HistoryTreeView::viewportEvent(QEvent* event) -{ - return QTreeView::viewportEvent(event); - -} -void HistoryTreeView::update() -{ - updateGeometry(); -} - -HistoryProxyWidget::HistoryProxyWidget(QTreeView* wid) -{ - m_wid = (HistoryTreeView*)wid; -} - -void HistoryProxyWidget::resizeEvent ( QGraphicsSceneResizeEvent * event ) -{ - QRectF r = geometry(); - QRect r1(r.left(),r.top(),r.width(),r.height()); - if(m_wid != NULL){ - m_wid->setGeometry(r1); - m_wid->update(); - } -} - -BookmarksHistoryViewPrivate::BookmarksHistoryViewPrivate(QWidget *parent) -{ - - // create the tree view widget - m_treeView = new HistoryTreeView(parent); - m_treeView->setHeaderHidden(true); //To keep the headers for columns hidden - m_treeView->setAllColumnsShowFocus(true); //To highlight the row completely when user focus on a row - m_treeView->setAnimated(true); //To animate when expands and collapses the folder - m_proxyWidget = NULL; - - //setting the style sheet for the tree view -#ifndef QT_NO_STYLE_STYLESHEET - m_treeView->setStyleSheet( " QTreeView { \ - background-color : white \ - } \ - QTreeView::branch { \ - border-image: none; image: none \ - } \ - QTreeView::item { \ - height: 28px; \ - } \ - QTreeView::branch:closed:has-children:has-siblings, \ - QTreeView::branch:has-children:!has-siblings:closed { \ - border-image: none;\ - image: url(:/icons/collapsed.png); \ - } \ - QTreeView::branch:open:has-children:has-siblings, \ - QTreeView::branch:open:has-children:!has-siblings { \ - border-image: none;\ - image: url(:/icons/expanded.png);\ - } \ - "); -#endif -} - -BookmarksHistoryViewPrivate::~BookmarksHistoryViewPrivate() -{ - delete m_treeView; -} - -/*! - * \class BookmarksHistoryView - * - * \brief Derived class of BookmarksView. Implements tree view functionality - * - * This class is implements a tree view of history items - */ - -/*! - * Basic BookmarksHistoryView constructor requires a BookmarksManager and - * a parent QWidget - * @param bm_mgr : BookmarksManager Handle - * @param parent : handle to parent widget - * @see BookmarksManager - */ -BookmarksHistoryView::BookmarksHistoryView(WRT::BookmarksManager* bm_mgr, QWidget *parent) - :BookmarksView(bm_mgr, parent) - ,dBookmarksHistoryViewPrivate(new BookmarksHistoryViewPrivate(parent)) -{ - dBookmarksHistoryViewPrivate->m_historyModel = bookmarksManager()->historyModel(); //getting the history model - dBookmarksHistoryViewPrivate->m_treeView->hide(); - m_jsObject = new BookmarksHistoryViewJSObject(this, 0, type()); -} - -/*! - * destructor - */ -BookmarksHistoryView::~BookmarksHistoryView() -{ - delete dBookmarksHistoryViewPrivate; -} - -// SLOTS - -/*! - * opens an item in the tree. If it is a history item it will emit - * the openUrl signal. - * @param index : handle to modelIndex -*/ -void BookmarksHistoryView::openItem(const QModelIndex &index) -{ - - BookmarkNode *itemNode = dBookmarksHistoryViewPrivate->m_historyModel->node(index); - if (!itemNode) - return; - - //open url for the history item - if (itemNode->isBookmark()) - { - emit openUrl(QUrl(itemNode->url)); - } -} - -/*! - * Handles when the folder is expanded - * - * @param index : handle to modelIndex -*/ -void BookmarksHistoryView::itemExpanded(const QModelIndex &index) -{ - BookmarkNode *itemNode = dBookmarksHistoryViewPrivate->m_historyModel->node(index); - if (!itemNode) - return; - - BookmarkNode *parentNode = itemNode->parent(); - - if (!parentNode) - return; - - if (parentNode->parent()){ - dBookmarksHistoryViewPrivate->m_treeView->setColumnWidth(0,COLUMN0_EXPANDED_WIDTH); - } - else{ - dBookmarksHistoryViewPrivate->m_treeView->setColumnWidth(0,COLUMN0_NORMAL_WIDTH); - } - - for (int i = 0; i < parentNode->children().count(); ++i){ - BookmarkNode *childNode = parentNode->children()[i]; - if (childNode->expanded && childNode != itemNode ){ - itemNode->expanded = false; - dBookmarksHistoryViewPrivate->m_treeView->collapse(dBookmarksHistoryViewPrivate->m_historyModel->index(childNode)); - } - } - - itemNode->expanded = true; -} - -/*! - * Handles when the folder is collapsed - * - * @param index : handle to modelIndex -*/ -void BookmarksHistoryView::itemCollapsed(const QModelIndex &index) -{ - - BookmarkNode *itemNode = dBookmarksHistoryViewPrivate->m_historyModel->node(index); - if (!itemNode) - return; - - //set expanded false for the item which is collapsed - itemNode->expanded = false; -} - -/*! - activate the view's resources. Could be connected by client to view visibility -*/ -void BookmarksHistoryView::activate() -{ - Q_ASSERT(!d->m_isActive); - - bookmarksManager()->updateHistory(); - dBookmarksHistoryViewPrivate->m_historyModel = bookmarksManager()->historyModel(); - dBookmarksHistoryViewPrivate->m_treeView->setModel(dBookmarksHistoryViewPrivate->m_historyModel); //set model for the view - dBookmarksHistoryViewPrivate->m_treeView->setColumnWidth(0,COLUMN0_NORMAL_WIDTH); //set the 0th column's width - - //Connect the signals - connect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(activated(const QModelIndex &)), - this, SLOT(openItem(const QModelIndex &))); - connect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(expanded(const QModelIndex &)), - this, SLOT(itemExpanded(const QModelIndex &))); - connect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(collapsed(const QModelIndex &)), - this, SLOT(itemCollapsed(const QModelIndex &))); - - connect(this, SIGNAL(close()), this, SLOT(deactivate())); - - BookmarkNode *historyRootNode = bookmarksManager()->history(); - - for (int i = 0; i < historyRootNode->children().count(); ++i){ - BookmarkNode *node = historyRootNode->children()[i]; - - //For folder set the 1st column spanned throughout - if(node->isFolder()) { - dBookmarksHistoryViewPrivate->m_treeView->setFirstColumnSpanned(i, QModelIndex(),true); - //expand "Today" folder when activating the view itself - - if(QDateTime::currentDateTime().date().toString() == node->date.toString()) { - dBookmarksHistoryViewPrivate->m_treeView->expand(dBookmarksHistoryViewPrivate->m_historyModel->index(node)); - } - - for (int j = 0; j < node->children().count(); ++j){ - BookmarkNode *subNode = node->children()[j]; - - if(subNode->isFolder()) { - dBookmarksHistoryViewPrivate->m_treeView->setFirstColumnSpanned(j, - dBookmarksHistoryViewPrivate->m_historyModel->index(node),true); - } - - } - } - } - - dBookmarksHistoryViewPrivate->m_treeView->show(); //show the view - d->m_isActive = true; - - emit activated(); - - dBookmarksHistoryViewPrivate->m_treeView->setCurrentIndex ( bookmarksManager()->historyModel()->index(0,0)); - dBookmarksHistoryViewPrivate->m_treeView->setFocus(); -} - -/*! - deactivate the view's resources. Could be connected by client to view visibility -*/ -void BookmarksHistoryView::deactivate() -{ - Q_ASSERT(d->m_isActive); - - // disconnect signals - disconnect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(activated(const QModelIndex &)), - this, SLOT(openItem(const QModelIndex &))); - disconnect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(expanded(const QModelIndex &)), - this, SLOT(itemExpanded(const QModelIndex &))); - disconnect(dBookmarksHistoryViewPrivate->m_treeView, SIGNAL(collapsed(const QModelIndex &)), - this, SLOT(itemCollided(const QModelIndex &))); - - disconnect(this, SIGNAL(close()), this, SLOT(deactivate())); - - bookmarksManager()->setHistoryView(NULL); - dBookmarksHistoryViewPrivate->m_treeView->hide(); //hide the view - d->m_isActive = false; - - emit deactivated(); -} - -QGraphicsWidget* BookmarksHistoryView::widget() const -{ - assert(qWidget()); - if(!dBookmarksHistoryViewPrivate->m_proxyWidget){ - dBookmarksHistoryViewPrivate->m_proxyWidget = new HistoryProxyWidget(dBookmarksHistoryViewPrivate->m_treeView); - dBookmarksHistoryViewPrivate->m_proxyWidget->setWidget(qWidget()); - } - - return dBookmarksHistoryViewPrivate->m_proxyWidget; -} - - -/*! - Return the widget handle of this view -*/ -QWidget* BookmarksHistoryView::qWidget() const -{ - return dBookmarksHistoryViewPrivate->m_treeView; -} - -/*! - Return the title of this view for display - @return Title string -*/ -QString BookmarksHistoryView::title() -{ - return tr("Recent Urls"); -} - -/*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc.) (empty for now) -*/ -QList<QAction*> BookmarksHistoryView::getContext() -{ - QList<QAction*> contextList; - return contextList; -} - - -ControllableView* BookmarksHistoryView::createNew(QWidget *parent) -{ - return new BookmarksHistoryView(BookmarksManager::getSingleton(),parent); -} - -BookmarksHistoryViewJSObject::BookmarksHistoryViewJSObject(BookmarksHistoryView* view, QWebFrame* webFrame, const QString& objectName) - : ControllableViewJSObject(view, webFrame, objectName) -{ - connect(view,SIGNAL(activated()),this,SIGNAL(activated())); - connect(view,SIGNAL(deactivated()),this,SIGNAL(deactivated())); - connect(view,SIGNAL(openUrl(const QUrl &)),this,SIGNAL(openUrl())); -} - -BookmarksHistoryViewJSObject::~BookmarksHistoryViewJSObject() -{ - disconnect(static_cast<BookmarksHistoryView*>(m_contentView),SIGNAL(activated()),this,SIGNAL(activated())); - disconnect(static_cast<BookmarksHistoryView*>(m_contentView),SIGNAL(deactivated()),this,SIGNAL(deactivated())); - disconnect(static_cast<BookmarksHistoryView*>(m_contentView),SIGNAL(openUrl(const QUrl &)),this,SIGNAL(openUrl())); -} - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/controllableview.h --- a/browsercore/appfw/Api/Views/controllableview.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/controllableview.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * 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 __CONTROLLABLEVIEW_H__ #define __CONTROLLABLEVIEW_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/controllableviewimpl.cpp --- a/browsercore/appfw/Api/Views/controllableviewimpl.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/controllableviewimpl.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - // just to allow QT to generate moc_ file #include "controllableviewimpl.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/controllableviewimpl.h --- a/browsercore/appfw/Api/Views/controllableviewimpl.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/controllableviewimpl.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * 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 __CONTROLLABLEVIEWIMPL_H__ #define __CONTROLLABLEVIEWIMPL_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/controllableviewjsobject.cpp --- a/browsercore/appfw/Api/Views/controllableviewjsobject.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/controllableviewjsobject.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * Copyright (c) 2010 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: * */ - -#include "qwebframe.h" +#include <QWebFrame> #include "scriptobjects.h" #include "actionjsobject.h" #include "controllableview.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/controllableviewjsobject.h --- a/browsercore/appfw/Api/Views/controllableviewjsobject.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/controllableviewjsobject.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,26 +1,29 @@ /* * Copyright (c) 2010 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 __CONTOROLLABLEVIEWJSOBJECT_H__ #define __CONTOROLLABLEVIEWJSOBJECT_H__ #include "brtglobal.h" -#include "qwebframe.h" +#include <QWebFrame> #include <QPointer> class ControllableView; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/icons/blankwindow.png Binary file browsercore/appfw/Api/Views/icons/blankwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/icons/collapsed.png Binary file browsercore/appfw/Api/Views/icons/collapsed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/icons/expanded.png Binary file browsercore/appfw/Api/Views/icons/expanded.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/mostvisitedpagestore.cpp --- a/browsercore/appfw/Api/Views/mostvisitedpagestore.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/mostvisitedpagestore.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,24 +1,28 @@ /* * Copyright (c) 2010 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: * */ - #include <QtGui> #include "mostvisitedpagestore.h" +#include "bedrockprovisioning.h" const QString KMostVistedStoreFile = "mostvisitedpages.dat"; const uint KMostVistedStoreVersion = 1; @@ -107,10 +111,24 @@ readStore(); } + +void MostVisitedPageStore::clearMostVisitedPageStore() +{ + for (int i = m_pageList.size() - 1; i >= 0; --i) + delete m_pageList.takeAt(i); + + //deleting MVP file + QFile file(m_mvpFile); + file.remove(); + + //create default thumbnails + initializeDefaultPageThumbnails(); +} + MostVisitedPageStore::~MostVisitedPageStore() { writeStore(); - for (int i = 0; i < m_pageList.size(); ++i) + for (int i = m_pageList.size() - 1; i >= 0; --i) delete m_pageList.takeAt(i); } @@ -155,15 +173,15 @@ delete m_pageList.takeLast(); } } else if (pageThumbnail) { - // add thumbnail, delete if it has any old thumbnail - - // This check is specifically added to take into account of - // future code changes if thumbnail gets assigned somewhere else - if (m_pageList[found]->m_pageThumbnail) { - delete m_pageList[found]->m_pageThumbnail; - } - - m_pageList[found]->m_pageThumbnail = pageThumbnail; + // add thumbnail, delete if it has any old thumbnail + + //This check is specifically added to take into account of + //future code changes if thumbnail gets assigned somewhere else + if (m_pageList[found]->m_pageThumbnail) { + delete m_pageList[found]->m_pageThumbnail; + } + + m_pageList[found]->m_pageThumbnail = pageThumbnail; } m_needPersistWrite = true; @@ -232,20 +250,17 @@ } file.close(); } - - if (!m_pageList.size()) { - m_pageList.append(new MostVisitedPage(KDefaultPage1)); - m_pageList.append(new MostVisitedPage(KDefaultPage2)); - m_pageList.append(new MostVisitedPage(KDefaultPage3)); - m_pageList.append(new MostVisitedPage(KDefaultPage4)); - m_pageList.append(new MostVisitedPage(KDefaultPage5)); - } + + initializeDefaultPageThumbnails(); } void MostVisitedPageStore::writeStore() { //if only store is modified then save it. - if (!m_needPersistWrite) + + bool enabled = (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("SaveHistory"); + + if ((!m_needPersistWrite) || (!enabled)) return; // save url store @@ -263,3 +278,15 @@ } m_needPersistWrite = false; } + +void MostVisitedPageStore::initializeDefaultPageThumbnails() +{ + if (!m_pageList.isEmpty()) + return; + + m_pageList.append(new MostVisitedPage(KDefaultPage1)); + m_pageList.append(new MostVisitedPage(KDefaultPage2)); + m_pageList.append(new MostVisitedPage(KDefaultPage3)); + m_pageList.append(new MostVisitedPage(KDefaultPage4)); + m_pageList.append(new MostVisitedPage(KDefaultPage5)); +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/mostvisitedpagestore.h --- a/browsercore/appfw/Api/Views/mostvisitedpagestore.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Api/Views/mostvisitedpagestore.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * 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: * */ - #include "BWFGlobal.h" class QDataStream; @@ -66,7 +69,9 @@ MostVisitedPageList &pageList(){ return m_pageList;} MostVisitedPage *pageAt(int index); - + + void initializeDefaultPageThumbnails(); + void clearMostVisitedPageStore(); protected: bool compareUrls(QString& url1, QString &url2); void readStore(); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/views.qrc --- a/browsercore/appfw/Api/Views/views.qrc Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>icons/expanded.png</file> - <file>icons/collapsed.png</file> - <file>icons/blankwindow.png</file> -</qresource> -</RCC> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/webcontentview.cpp --- a/browsercore/appfw/Api/Views/webcontentview.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1007 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QDebug> -#include "qwebframe.h" -#include <QGraphicsSceneResizeEvent> -#include <QGraphicsView> -#include <QGraphicsWebView> -#include <QNetworkReply> -#include <QPainter> -#include <QSettings> -#include <QWebPage> -#include <QWebHistory> -#include <qwebelement.h> -#include <QGraphicsSceneContextMenuEvent> -#include <QTimer> -#include <qevent.h> - -#include "browserpagefactory.h" -#include "webcontentview.h" -#include "controllableviewjsobject.h" -#include "scriptobjects.h" -#include "WebViewEventContext.h" - -#define safe_connect(src, srcSig, target, targetSlot) \ - { int res = connect(src, srcSig, target, targetSlot); assert(res); } - -// ---------------------------------------------------------- - -const QString KViewPortWidthTag("width"); -const QString KViewPortHeightTag("height"); -const QString KViewPortInitialScaleTag("initial-scale"); -const QString KViewPortMinScaleTag("minimum-scale"); -const QString KViewPortMaxScaleTag("maximum-scale"); -const QString KViewPortUserScalableTag("user-scalable"); -const QString KViewPortDeviceWidthTag("device-width"); -const QString KViewPortDeviceHeightTag("device-height"); - - -const int KDefaultViewportWidth = 980; -const int KDefaultPortraitScaleWidth = 540; -const int KMinViewportWidth = 200; -const int KMaxViewportWidth = 10000; -const int KMinViewportHeight = 200; -const int KMaxViewportHeight = 10000; -const int KMaxPageZoom = 10; -const qreal KDefaultMinScale = 0.25; -const qreal KDefaultMaxScale = 10.00; -const QPoint KFocussPoint(5, 50); -const qreal KZoomInStep = 1.05; -const qreal KZoomOutStep = 0.95238; -const int checkerSize = 16; -const unsigned checkerColor1 = 0xff555555; -const unsigned checkerColor2 = 0xffaaaaaa; - -WebContentView::WebContentView(QWebPage* pg,QWidget *parent) - : m_networkMgr(0) - ,m_timer(NULL) - -//, m_flickCharm(0) -{ - qDebug() << "WebContentView::WebContentView"; - m_widget = new WebContentWidget(parent,this,pg); - setZoomActions(); - - m_jsObject = new WebContentViewJSObject(this, 0); - - m_networkMgr = webView()->page()->networkAccessManager(); - - webView()->page()->currentFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); - webView()->page()->currentFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff); - - - connectAll(); -} - -void WebContentView::connectAll() { - - safe_connect(widget(), SIGNAL(contextEvent(WebViewEventContext *)), m_jsObject, SLOT(onContextEvent(WebViewEventContext *))); -} - -WebContentView::~WebContentView() { - disconnect(m_jsObject); - disconnect(webView()); - - delete m_actionZoomIn; - delete m_actionZoomOut; - - delete m_widget; -} - -QVariant WebContentView::getContentWindowObject() { - try { - return webView()->page()->mainFrame()->evaluateJavaScript("window"); - } - catch(...) { - qDebug() << "WebContentView::getContentWindowObject: caught expection"; - return QVariant(); - } -} - -void WebContentView::setZoomActions(){ - - // Create zoomIn and zoomOut actions */ - m_actionZoomIn = new QAction("zoomIn", this); - m_actionZoomIn->setObjectName("zoomIn"); - - m_actionZoomOut = new QAction("zoomOut", this); - m_actionZoomOut->setObjectName("zoomOut"); - /* Disable zoomOut action initially as we are the the minimum scale */ - /* Revisit this to determine whether we can use the change signal to - * set the zoomOut button image initially as well - */ - m_actionZoomOut->setEnabled(false); - - connect(m_actionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn())); - connect(m_actionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut())); - - -} - - -void WebContentView::bitmapZoomStop() -{ - if(m_timer) { - m_timer->stop(); - disconnect(m_timer,SIGNAL(timeout())); - delete m_timer; - m_timer = NULL; - } - qreal zoomFactor = m_value * webView()->zoomFactor(); - ( (zoomFactor+0.001) >= webView()->maximumScale() )? webView()->setZoomFactor(webView()->maximumScale()):webView()->setZoomFactor(zoomFactor); - webView()->bitmapZoomCleanup(); -} - -void WebContentView::zoomP() -{ - if((m_value * webView()->zoomFactor()) > webView()->maximumScale()) { - if(m_timer && m_timer->isActive()) - bitmapZoomStop(); - }else { - if(m_timer->isSingleShot()) { - m_timer->setSingleShot(false); - m_timer->start(1); - } - webView()->setBitmapZoom(m_value * webView()->zoomFactor()); - m_value *= KZoomInStep; - } -} - -void WebContentView::zoomN() -{ - if((m_value * webView()->zoomFactor()) < webView()->minimumScale()){ - if(m_timer && m_timer->isActive()) - bitmapZoomStop(); - }else { - if(m_timer->isSingleShot()) { - m_timer->setSingleShot(false); - m_timer->start(1); - } - webView()->setBitmapZoom(m_value * webView()->zoomFactor()); - m_value *= KZoomOutStep; - } -} - -void WebContentView::zoomIn(qreal deltaPercent) -{ - if(webView() && webView()->isUserScalable()) { - if(m_timer && m_timer->isActive()) { - if(!m_timer->isSingleShot()) - m_value /= KZoomInStep; - bitmapZoomStop(); - return; - }else if(!m_timer) - m_timer = new QTimer(this); - - m_value = KZoomInStep; - - if( (m_value * webView()->zoomFactor()) < webView()->maximumScale()) { - webView()->createPageSnapShot(); - bool ret = connect(m_timer,SIGNAL(timeout()),this,SLOT(zoomP())); - zoomP(); - m_timer->setSingleShot(true); - m_timer->start(500); - }else { - delete m_timer; - m_timer = NULL; - webView()->setZoomFactor(m_value * webView()->zoomFactor()); - } - } -} - -void WebContentView::zoomOut(qreal deltaPercent) -{ - if(webView() && webView()->isUserScalable()) { - if(m_timer && m_timer->isActive()) { - if(!m_timer->isSingleShot()) - m_value /= KZoomOutStep; - bitmapZoomStop(); - return; - }else if(!m_timer) - m_timer = new QTimer(this); - - m_value = KZoomOutStep; - - if( (m_value * webView()->zoomFactor()) > webView()->minimumScale()) { - webView()->createPageSnapShot(); - bool ret = connect(m_timer,SIGNAL(timeout()),this,SLOT(zoomN())); - zoomN(); - m_timer->setSingleShot(true); - m_timer->start(500); - }else { - delete m_timer; - m_timer = NULL; - webView()->setZoomFactor(m_value * webView()->zoomFactor()); - } - } -} -void WebContentView::deactivateZoomActions() -{ - m_actionZoomOut->setEnabled(false); - m_actionZoomIn->setEnabled(false); -} - -void WebContentView::changeZoomAction(qreal zoom){ - - if(!(webView()->isUserScalable() ) ){ - deactivateZoomActions(); - } - else { - - if (zoom <= webView()->minimumScale() ) { - m_actionZoomOut->setEnabled(false); - } - else { - m_actionZoomOut->setEnabled(true); - } - - if (zoom >= webView()->maximumScale() ){ - m_actionZoomIn->setEnabled(false); - } - else { - m_actionZoomIn->setEnabled(true); - } - } -} - -void WebContentView::setZoomFactor(qreal factor){ - if(webView()) - webView()->setZoomFactor(factor); -} - -qreal WebContentView::getZoomFactor() const { - return webViewConst() ? webViewConst()->zoomFactor() : 0.0; -} - - - - -void WebContentView::activate() { - WebContentViewBase::activate(); -} - -void WebContentView::deactivate() { - WebContentViewBase::deactivate(); -} - -static void appendAction(QWebPage* page, QList<QAction*> &list, enum QWebPage::WebAction webAction, const QString &name) { - QAction *action = page->action(webAction); - if(action) { - action->setObjectName(name); - list.append(action); - } -} - -/*! - Return the list of public QActions most relevant to the view's current context. - @return List of public actions -*/ -QList<QAction *> WebContentView::getContext() -{ - // Get some of the actions from the page (there are many more available) and build a list - // list of them. - - QList<QAction*> actions; - - /* Add zoomIn and zoomOut actions created earlier*/ - actions.append(m_actionZoomIn); - actions.append(m_actionZoomOut); - - return actions; -} - -void WebContentView::scrollViewBy(int dx, int dy) -{ - wrtPage()->mainFrame()->scroll(dx, dy); -} - -void WebContentView::scrollViewTo(int x, int y) -{ - wrtPage()->mainFrame()->setScrollPosition(QPoint(x, y)); -} - - -void WebContentView::showMessageBox(WRT::MessageBoxProxy* proxy) -{ -/* - QMessageBox msgBox(this); - msgBox.setText(proxy->m_text); - msgBox.setInformativeText(proxy->m_informativeText); - msgBox.setDetailedText(proxy->m_detailedText); - msgBox.setStandardButtons(proxy->m_buttons); - msgBox.setDefaultButton(proxy->m_defaultButton); - msgBox.setIcon(proxy->m_icon); - int ret = msgBox.exec(); - */ - QString displayText = proxy->m_text + QLatin1String("\n") + QLatin1String("\n")+ proxy->m_detailedText + QLatin1String("\n") + QLatin1String("\n") + proxy->m_informativeText; - int ret = QMessageBox::warning(0/* TODO: find appropriate widget if required or just remove this widget()*/, - proxy->m_text, displayText, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); - proxy->onMessageBoxResponse(ret); -} - -ControllableView* WebContentView::createNew(QWidget *parent) -{ - QWebPage* page = BrowserPageFactory::openBrowserPage(); - return new WebContentView(page, parent); -} - - -// --------------------------------------------------------------------------- -// WebContentViewJSObject -// --------------------------------------------------------------------------- - -void WebContentViewJSObject::statusBarMessage( const QString & text ){ - emit onStatusBarMessage(text); -} - -void WebContentViewJSObject::statusBarVisibilityChangeRequested(bool visible){ - emit onStatusBarVisibilityChangeRequested(visible); -} - -void WebContentViewJSObject::onContextEvent(WebViewEventContext *context){ - QWebFrame *chrome = chromeFrame(); - if(chrome) { - chrome->addToJavaScriptWindowObject(context->objectName(), context, QScriptEngine::ScriptOwnership); - } - emit contextEvent(context); -} - -// --------------------------------------------------------------------------- -// WebContentWidget -// --------------------------------------------------------------------------- -void WebContentWidget::updateViewport() -{ - if (page() && size() != page()->viewportSize()) { - page()->setViewportSize(size().toSize()); - } - setViewportSize(); -} - -void WebContentWidget::setBlockElement(QWebElement pt) -{ - m_BlockElement = pt; -} - -QImage WebContentWidget::getPageSnapshot() -{ - QImage img(size().toSize(), QImage::Format_RGB32); - QPainter painter(&img); - QWebFrame *frame = page()->mainFrame(); - - painter.fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); -// QTransform transform; -// transform.scale(d->m_pageZoomFactor, d->m_pageZoomFactor); -// painter.translate(-transform.map(frame->scrollPosition())); - - QRegion clipRegion(QRect(QPoint(0,0),size().toSize())); -// QTransform invert = transform.inverted(); -// clipRegion = invert.map(clipRegion); -// clipRegion.translate(frame->scrollPosition()); - -// painter.scale(d->m_pageZoomFactor, d->m_pageZoomFactor); -// d->m_webPage->mainFrame()->renderContents(&painter, clipRegion); - frame->render(&painter, clipRegion); - - return img; -} - -void WebContentWidget::updateViewportSize(QGraphicsSceneResizeEvent* e) -{ - //if there is change in mode (like landscape, potraite relayout the content) - if (e->newSize().width() == e->oldSize().width()) - return; - m_isResize = true; - setViewportSize(); - m_isResize = false; -} - -void WebContentWidget::resizeEvent(QGraphicsSceneResizeEvent* e) -{ - // set the fixed text layout size for text wrapping - if (page()) { -#if defined CWRTINTERNALWEBKIT - p->m_webPage->settings()->setMaximumTextColumnWidth(e->newSize().width() - 6); -#endif - } - - m_previousViewPortwidth = page()->viewportSize().width(); - - const QSize &s = e->newSize().toSize(); - if (page() && s != page()->viewportSize()) { - if(m_BlockElement.isNull()) { - QPoint pos = QPoint(0,0); - QWebFrame* frame = page()->frameAt(pos); - frame = (frame) ? frame : page()->currentFrame(); - QWebHitTestResult htr = frame->hitTestContent(pos); - m_BlockInFocus = htr.element(); - - if(m_BlockInFocus.tagName() != "IMG") - m_BlockInFocus = htr.enclosingBlockElement(); - - QPoint position = m_BlockInFocus.geometry().topLeft() - page()->currentFrame()->scrollPosition(); - m_Ratiox = (qreal) position.x() / m_BlockInFocus.geometry().width(); - m_Ratioy = (qreal) position.y() / m_BlockInFocus.geometry().height(); - } - page()->setViewportSize(s); - } - - updateViewportSize(e); -} - -void WebContentWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent* event) -{ - QPoint p = event->pos().toPoint(); - QWebHitTestResult hitTest = page()->currentFrame()->hitTestContent(p); - - WebViewEventContext *context = - new WebViewEventContext(view()->type(), hitTest); - - emit contextEvent(context); - event->accept(); -} - -void WebContentWidget::setZoomFactor(qreal zoom) -{ - this->setFocus(); - if (!m_userScalable) - return; - - setPageZoomFactor(zoom); -} - -void WebContentWidget::setPageZoomFactor(qreal zoom) -{ - - //qDebug() << __func__ << "Zoom " << zoom << "Max : " << m_maximumScale << "Min: " << m_minimumScale; - - if (zoom < m_minimumScale) - zoom = m_minimumScale; - else if (zoom > m_maximumScale) - zoom = m_maximumScale; - - - QPoint pos = QPoint(0,0); - - if(!m_isResize) { - QWebFrame* frame = page()->frameAt(pos); - frame = (frame) ? frame : page()->currentFrame(); - QWebHitTestResult htr = frame->hitTestContent(pos); - m_BlockInFocus = htr.element(); - - if(m_BlockInFocus.tagName() != "IMG") - m_BlockInFocus = htr.enclosingBlockElement(); - - QPoint position = m_BlockInFocus.geometry().topLeft() - page()->currentFrame()->scrollPosition(); - m_Ratiox = (qreal) position.x() / m_BlockInFocus.geometry().width(); - m_Ratioy = (qreal) position.y() / m_BlockInFocus.geometry().height(); - } - - if( m_dirtyZoomFactor != zoom ) { - m_dirtyZoomFactor = zoom; - } - - QGraphicsWebView::setZoomFactor( zoom ); - - if(!m_BlockElement.isNull() && m_isResize) { - QPoint imageFocusPoint; - QPoint m_focusedBlockPt = QPoint(m_BlockElement.geometry().topLeft()) - page()->mainFrame()->scrollPosition(); - if(m_BlockElement.tagName() != "IMG" && (m_BlockElement.styleProperty(QString("background-image"),QWebElement::InlineStyle) == "")) - page()->mainFrame()->scroll(m_focusedBlockPt.x() - KFocussPoint.x() , m_focusedBlockPt.y() - KFocussPoint.y()); - else { - if((page()->viewportSize().width() - m_BlockElement.geometry().width()) > 0) - imageFocusPoint.setX((page()->viewportSize().width() - m_BlockElement.geometry().width())/2); - else - imageFocusPoint.setX(0); - - if((page()->viewportSize().height() - m_BlockElement.geometry().height()) > 0) - imageFocusPoint.setY((page()->viewportSize().height() - m_BlockElement.geometry().height())/2); - else - imageFocusPoint.setY(0); - - page()->mainFrame()->scroll(m_focusedBlockPt.x() - imageFocusPoint.x() , - m_focusedBlockPt.y() - imageFocusPoint.y()); - } - m_focusedBlockPt = QPoint(m_BlockElement.geometry().topLeft()) - page()->mainFrame()->scrollPosition(); - emit BlockFocusChanged(m_focusedBlockPt); - } else { - QPoint m_focusedBlockPt = QPoint(m_BlockInFocus.geometry().topLeft()) - page()->mainFrame()->scrollPosition(); - page()->currentFrame()->scroll(m_focusedBlockPt.x() - (m_Ratiox * m_BlockInFocus.geometry().width()), - m_focusedBlockPt.y() - (m_Ratioy * m_BlockInFocus.geometry().height())); - m_BlockElement = QWebElement(); - } - - m_webContentView->changeZoomAction(zoom); - -} - -void WebContentWidget::setDirtyZoomFactor(qreal zoom) -{ - if( m_dirtyZoomFactor == zoom ) - return; - - m_dirtyZoomFactor = zoom; - - update(); -} - - -void WebContentWidget::setCheckeredPixmap() -{ - delete m_checkeredBoxPixmap; - m_checkeredBoxPixmap = NULL; - int checkerPixmapSizeX = size().toSize().width(); - int checkerPixmapSizeY = size().toSize().height() + 50; - m_checkeredBoxPixmap = new QPixmap(size().width(), size().height() + 50); - QPainter painter(m_checkeredBoxPixmap); - - for (int y = 0; y < checkerPixmapSizeY; y += checkerSize / 2) { - bool alternate = y % checkerSize; - for (int x = 0; x < checkerPixmapSizeX; x += checkerSize / 2) { - QColor color(alternate ? checkerColor1 : checkerColor2); - painter.fillRect(x, y, checkerSize / 2, checkerSize / 2, color); - alternate = !alternate; - } - } -} - -void WebContentWidget::createPageSnapShot() -{ - bitmapZoomCleanup(); - QRegion clipRegion; - QWebFrame *frame = page()->mainFrame(); - m_bitmapImage = new QImage(size().width() ,size().height(),QImage::Format_RGB32); - clipRegion = QRect(QPoint(0,0),size().toSize()); - QPainter painterImage(m_bitmapImage); - painterImage.fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); - frame->render(&painterImage,clipRegion); -} - -void WebContentWidget::bitmapZoomCleanup() -{ - m_bitmapZoom = false; - if(m_bitmapImage) { - delete m_bitmapImage; - m_bitmapImage = NULL; - } -} - -void WebContentWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) -{ - //if(!m_active) return; - if(m_freezeCount > 0) { - // Frozen, paint the snapshot. - painter->drawPixmap(0, 0, *m_frozenPixmap); - }else { - if (m_bitmapZoom) { - qreal czf = 1; - qreal zoomF = zoomFactor(); - - if( m_bitmapZoomFactor != zoomF ) - czf = m_bitmapZoomFactor/zoomF; - - painter->save(); - - if(czf < 1) - painter->drawPixmap(QPoint(0,0), *m_checkeredBoxPixmap); - - painter->drawImage(QRectF(0,0,size().width() * czf,size().height() * czf), *m_bitmapImage); - painter->restore(); - } else if( zoomFactor() == m_dirtyZoomFactor ) { - // Cannot use normal QGraphicsWebView paint because have to fill background with white for the phone build - // QGraphicsWebView::paintEvent( event); - QWebFrame* frame = page()->mainFrame(); - painter->fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); - QGraphicsWebView::paint(painter, option, widget); - } else { - qreal czf = m_dirtyZoomFactor / zoomFactor(); - - QWebFrame* frame = page()->mainFrame(); - - painter->save(); - painter->fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); - QTransform transform; - transform.scale(czf, czf); - //painter.translate(-transform.map(frame->scrollPosition())); - - QRegion clipRegion = geometry().toRect(); - - if(option && !option->exposedRect.isEmpty()) - clipRegion.intersect( option->exposedRect.toRect()); - - QTransform invert = transform.inverted(); - clipRegion = invert.map(clipRegion); - //clipRegion.translate(frame->scrollPosition()); - - painter->scale(czf, czf); - //p->m_webPage->mainFrame()->renderContents(&painter, clipRegion); - frame->render(painter, clipRegion); - painter->restore(); - } - } -} - -WebContentWidget::WebContentWidget(QObject* parent, WebContentView* view,QWebPage* pg) : QGraphicsWebView(0) -, m_webContentView(view) -, m_dirtyZoomFactor(1) -, m_frozenPixmap(0) -, m_freezeCount(0) -, m_wrtPage(0) -, m_bitmapZoom(false) -, m_pagePixmap(0) -, m_isResize(false) -, m_currentinitialScale(0) -, m_previousViewPortwidth(size().toSize().width()) -, m_bitmapImage(NULL) -, m_checkeredBoxPixmap(NULL) -{ - setParent(parent); - if( pg ) - { - setPage(pg); - } - m_currentinitialScale = zoomFactor(); - connect(page()->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(setViewportSize())); -} - -WebContentWidget::~WebContentWidget() -{ - if(m_wrtPage) - { - m_wrtPage->setView(0); - setPage(0); - } - if(m_bitmapImage) - delete m_bitmapImage; - if(m_checkeredBoxPixmap) - delete m_checkeredBoxPixmap; -} - -void WebContentWidget::setPage(QWebPage* pg) -{ - if(m_wrtPage) { - m_wrtPage->setView(0); - } - /* Reset the webview page as well - for its internal clean up */ - QGraphicsWebView::setPage(pg); - - m_wrtPage = pg; - -} - -void WebContentWidget::createPagePixmap() -{ - if (m_pagePixmap) - delete m_pagePixmap; - - m_pagePixmap = new QPixmap(size().toSize()); - QStyleOptionGraphicsItem op; - QPainter p(m_pagePixmap); - paint(&p,&op,0); - p.end(); -} - -void WebContentWidget::setBitmapZoom(qreal zoomF) { - if (!m_userScalable || (zoomF == zoomFactor())) - return; - if (zoomF < m_minimumScale) - zoomF = m_minimumScale; - else if (zoomF > m_maximumScale) - zoomF = m_maximumScale; - - m_bitmapZoom = true; - m_bitmapZoomFactor = zoomF; - update(); -} - -void WebContentWidget::deletePagePixmap() -{ - if (m_pagePixmap) { - delete m_pagePixmap; - m_pagePixmap = 0; - } - m_bitmapZoom = false; -} - -void WebContentWidget::setPageCenterZoomFactor(qreal zoom) -{ - //calculating the center of the widget - QPoint widgetCenter = rect().center().toPoint(); - //find the content size before applying zoom - QSize docSizeBeforeZoom = page()->mainFrame()->contentsSize(); - - qDebug()<<"setPageCenterZoomFactor() : "<<zoom; - setZoomFactor(zoom); - //after applying zoom calculate the document size and document center point - QSize docSizeAfterZoom = page()->mainFrame()->contentsSize(); - QPoint docPoint = widgetCenter + page()->mainFrame()->scrollPosition(); - - //calculate the shift in center point after applying zoom - int dx = docSizeAfterZoom.width() * docPoint.x() / docSizeBeforeZoom.width(); - int dy = docSizeAfterZoom.height() * docPoint.y() / docSizeBeforeZoom.height(); - - //move back the shifted center - page()->mainFrame()->scroll(dx-docPoint.x(), dy-docPoint.y()); -} - -void WebContentWidget::initializeViewportParams() -{ - m_maximumScale = KDefaultMaxScale; - m_userScalable = true; - m_inferWidthHeight = true; - - m_aspectRation = size().width() / size().height(); - m_viewportWidth = KDefaultViewportWidth; - m_viewportHeight = (int)size().height(); - - if( size().width() < size().height()) //if Portrait - m_initialScale = size().width() / KDefaultPortraitScaleWidth; - else - m_initialScale = size().width() / KDefaultViewportWidth; - m_minimumScale = m_initialScale; - -} - -/*! - * Provides the default values - used when opening a new blank window - */ -ZoomMetaData WebContentWidget::defaultZoomData() -{ - ZoomMetaData data; - - data.maxScale = KDefaultMaxScale; - data.minScale = KDefaultMinScale; - data.userScalable = false; - - return data; -} - -/*! - * Set the viewport Size - */ -void WebContentWidget::setViewportSize() -{ - QWebFrame* frame = page()->mainFrame(); - - initializeViewportParams(); - - // TODO: INVESTIGATE: In the case of multiple windows loading pages simultaneously, it is possible - // to be calling this slot on a signal from a frame that is not - // the frame of the page saved here. It might be better to use 'sender' instead of - // page->mainFrame() to get the metaData so that we use the meta data of the corresponding - // frame - QMap<QString, QString> metaData = frame->metaData(); - QString viewportTag = metaData.value("viewport"); - - if (!viewportTag.isEmpty()) { - QStringList paramList; - - if (viewportTag.contains(';')) { - paramList = viewportTag.split(";", QString::SkipEmptyParts); - } else { - paramList = viewportTag.split(",", QString::SkipEmptyParts); - } - - int paramCount = 0; - while (paramCount < paramList.count()) { - QStringList subParamList = paramList[paramCount].split ('=', QString::SkipEmptyParts); - paramCount++; - QString viewportProperty = subParamList.front(); - QString propertyValue = subParamList.back(); - parseViewPortParam(viewportProperty.trimmed(), propertyValue.trimmed()); - } - } - - m_initialScale = qBound(m_minimumScale, m_initialScale, m_maximumScale); - -#if QT_VERSION < 0x040600 - page()->setFixedContentsSize(QSize(m_viewportWidth, m_viewportHeight)); -#else - page()->setPreferredContentsSize(QSize(m_viewportWidth, m_viewportHeight)); -#endif - qreal zoomF = 0.0; - QString str; - if(m_isResize && (m_currentinitialScale != zoomFactor())) { - zoomF = ((qreal)(page()->viewportSize().width()-10) * zoomFactor())/(m_previousViewPortwidth-10); - str.setNum(zoomF,'f',2); - zoomF = str.toDouble(); - setPageZoomFactor(zoomF); - } - else { - setPageZoomFactor(m_initialScale); - } - m_BlockInFocus = QWebElement(); - m_currentinitialScale = m_initialScale; - - setCheckeredPixmap(); - - // Let the page save the data. Even though it is part of the frame, it is easier to - // save the info in the page to avoid parsing the meta data again. - emit pageZoomMetaDataChange(frame, pageZoomMetaData()); -} - -qreal WebContentWidget::initialScale() -{ - return m_initialScale; -} - -void WebContentWidget::parseViewPortParam(const QString &propertyName, const QString &propertyValue) -{ - if (propertyName == KViewPortWidthTag) { - if (propertyValue == KViewPortDeviceWidthTag) { - m_viewportWidth = (int)size().width(); - m_viewportHeight = m_viewportWidth * m_aspectRation; - } - else if(propertyValue == KViewPortDeviceHeightTag) { - m_viewportWidth = (int)size().height(); - m_viewportHeight = m_viewportWidth * m_aspectRation; - } - else { - m_viewportWidth = propertyValue.toInt(); - - if (m_viewportWidth < KMinViewportWidth) - m_viewportWidth = KMinViewportWidth; - else if (m_viewportWidth > KMaxViewportWidth) - m_viewportWidth = KMaxViewportWidth; - - m_viewportHeight = m_viewportWidth * m_aspectRation; - } - m_initialScale = size().width() / m_viewportWidth; - if (m_initialScale < KDefaultMinScale || m_initialScale > KDefaultMaxScale) - m_initialScale = KDefaultMinScale; - m_minimumScale = m_initialScale; - m_inferWidthHeight = false; - } - else if (propertyName == KViewPortHeightTag) { - if (propertyValue == KViewPortDeviceWidthTag) { - m_viewportHeight = (int)size().width(); - m_viewportWidth = m_viewportHeight * m_aspectRation; - } - else if (propertyValue == KViewPortDeviceHeightTag) { - m_viewportHeight = (int)size().height(); - m_viewportWidth = m_viewportHeight * m_aspectRation; - } - else { - m_viewportHeight = propertyValue.toInt(); - - if (m_viewportHeight < KMinViewportHeight) - m_viewportHeight = KMinViewportHeight; - else if (m_viewportHeight > KMaxViewportHeight) - m_viewportHeight = KMaxViewportHeight; - - m_viewportWidth = m_viewportHeight * m_aspectRation; - } - m_initialScale = size().height() / m_viewportHeight; - if (m_initialScale < KDefaultMinScale || m_initialScale > KDefaultMaxScale) - m_initialScale = KDefaultMinScale; - m_minimumScale = m_initialScale; - m_inferWidthHeight = false; - } - else if (propertyName == KViewPortInitialScaleTag) { - m_initialScale = propertyValue.toDouble(); - if (m_inferWidthHeight) { - m_viewportWidth = (int)size().width(); - m_viewportHeight = m_viewportWidth * m_aspectRation; - } - } - else if (propertyName == KViewPortMinScaleTag) { - m_minimumScale = propertyValue.toDouble(); - if (m_minimumScale < 0 - || m_minimumScale > KMaxPageZoom - || m_minimumScale > m_maximumScale) - m_minimumScale = KDefaultMinScale; - } - else if (propertyName == KViewPortMaxScaleTag) { - m_maximumScale = propertyValue.toDouble(); - if (m_maximumScale < 0 - || m_maximumScale > KMaxPageZoom - || m_maximumScale < m_minimumScale) - - m_maximumScale = KDefaultMaxScale; - } - else if (propertyName == KViewPortUserScalableTag) { - if (propertyValue =="no" || propertyValue =="0") - { - m_userScalable = false; - view()->deactivateZoomActions(); - } - else - m_userScalable = true; - } -} - - -bool WebContentWidget::isUserScalable() -{ - return m_userScalable; -} - -qreal WebContentWidget::minimumScale() -{ - return m_minimumScale; -} - -qreal WebContentWidget::maximumScale() -{ - return m_maximumScale; -} - -ZoomMetaData WebContentWidget::pageZoomMetaData() { - - ZoomMetaData data; - - data.minScale = m_minimumScale; - data.maxScale = m_maximumScale; - data.userScalable = m_userScalable; - - return data; -} - -void WebContentWidget::setPageZoomMetaData(ZoomMetaData data) { - - m_minimumScale = data.minScale ; - m_maximumScale = data.maxScale ; - m_userScalable = data.userScalable; -} - -QWebPage* WebContentWidget::page() const -{ - if (!m_wrtPage) { - WebContentWidget* that = const_cast<WebContentWidget*>(this); - that->setPage(BrowserPageFactory::openBrowserPage()); - } - return m_wrtPage; -} - -QPointF WebContentWidget::mapToGlobal(const QPointF& p) -{ - QList<QGraphicsView*> gvList = scene()->views(); - QList<QGraphicsView*>::iterator it; - for(it = gvList.begin(); it != gvList.end(); it++) - { - if (static_cast<QGraphicsView*>(*it)->hasFocus()) - { - QWidget* viewport = static_cast<QGraphicsView*>(*it)->viewport(); - return viewport->mapToGlobal(mapToScene(p).toPoint()); - } - } - - return QPoint(0, 0); -} - -QPointF WebContentWidget::mapFromGlobal(const QPointF& p) -{ - QList<QGraphicsView*> gvList = scene()->views(); - QList<QGraphicsView*>::iterator it; - for(it = gvList.begin(); it != gvList.end(); it++) - { - if (static_cast<QGraphicsView*>(*it)->hasFocus()) - { - QWidget* viewport = static_cast<QGraphicsView*>(*it)->viewport(); - return mapFromScene(viewport->mapFromGlobal(p.toPoint())); - } - } - - return QPoint(0, 0); -} - -void WebContentWidget::setTextSizeMultiplier(qreal factor) -{ - page()->mainFrame()->setTextSizeMultiplier(factor); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Api/Views/webcontentview.h --- a/browsercore/appfw/Api/Views/webcontentview.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,283 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBCONTENTVIEW_H -#define WEBCONTENTVIEW_H - -#include <QObject> -#include <QVariant> -#include "qgraphicswebview.h" -#include "controllableviewimpl.h" -#include "messageboxproxy.h" -#include <qwebelement.h> -#include "ZoomMetaData.h" - -//class FlickCharm; -class WebContentView; -class QContextMenuEvent; -class WebViewEventContext; -class QGraphicsSceneContextMenuEvent; -class QWebPage; -class QWebFrame; -namespace WRT { -class MessageBoxProxy; -} - -class BWF_EXPORT WebContentWidget : public QGraphicsWebView -{ - Q_OBJECT -public: - - WebContentWidget(QObject* parent,WebContentView* view,QWebPage* pg); - virtual ~WebContentWidget(); - - inline WebContentView* view() const { return m_webContentView; } - - /*! - * \brief Returns zoom factor value - */ - qreal zoomFactor() { return m_wrtPage->mainFrame()->zoomFactor(); } - - /*! - * \brief Returns dirty zoom factor value - */ - qreal dirtyZoomFactor() { return m_dirtyZoomFactor; } - - /*! - * \brief Set zoom factor value - * \param zoom - */ - void setZoomFactor(qreal zoom); - - /*! - * \brief Set dirty zoom factor value - * \param zoom - */ - void setDirtyZoomFactor(qreal zoom); - - void setTextSizeMultiplier(qreal factor); - - QImage getPageSnapshot(); - - void bitmapZoomCleanup(); - void createPageSnapShot(); - - void resizeEvent(QGraphicsSceneResizeEvent* e); - - QWebPage* page() const; - void setPage(QWebPage* pg); - QWebPage* wrtPage() { return m_wrtPage; } - - void createPagePixmap(); - void setBitmapZoom(qreal zoom); - void deletePagePixmap(); - void setPageCenterZoomFactor(qreal zoom); - - void initializeViewportParams(); - void parseViewPortParam(const QString &propertyName, const QString &propertyValue); - bool isUserScalable(); - qreal minimumScale(); - qreal maximumScale(); - qreal initialScale(); - void updateViewport(); - void setBlockElement(QWebElement pt); - QPointF mapToGlobal(const QPointF& p); - QPointF mapFromGlobal(const QPointF& p); - - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) ; - void setPageZoomFactor(qreal zoom); - - void setCheckeredPixmap(); - - ZoomMetaData pageZoomMetaData(); - void setPageZoomMetaData(ZoomMetaData params); - ZoomMetaData defaultZoomData(); - -public slots: - void setViewportSize(); - -signals: - void contextEvent(WebViewEventContext *context); - void BlockFocusChanged(QPoint element); - - void pageZoomMetaDataChange(QWebFrame* frame, ZoomMetaData data);protected: - void paintEvent(QPaintEvent *event); - -protected: - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent* event); - -private: - void updateViewportSize(QGraphicsSceneResizeEvent* e); - - WebContentView* m_webContentView; - qreal m_dirtyZoomFactor; - QPixmap* m_frozenPixmap; - int m_freezeCount; - QWebPage* m_wrtPage; - QPixmap* m_pagePixmap; - bool m_bitmapZoom; - qreal m_aspectRation; - int m_viewportWidth; - int m_viewportHeight; - bool m_userScalable; - qreal m_minimumScale; - qreal m_maximumScale; - qreal m_initialScale; - bool m_inferWidthHeight; - bool m_isResize; - qreal m_currentinitialScale; - QWebElement m_BlockElement; - QWebElement m_BlockInFocus; - int m_previousViewPortwidth; - qreal m_Ratiox; - qreal m_Ratioy; - QImage* m_bitmapImage; - qreal m_bitmapZoomFactor; - QPixmap* m_checkeredBoxPixmap; -}; - -typedef ControllableViewBase WebContentViewBase; -class BWF_EXPORT WebContentView : public WebContentViewBase -{ - Q_OBJECT -public: - WebContentView(QWebPage* pg,QWidget *parent = 0); - virtual ~WebContentView(); - - static QString Type() { return "webView"; } - virtual QString type() const { return Type(); } - - QGraphicsWidget* widget() const { return static_cast<QGraphicsWidget*>(m_widget); } - - // Returns the DOM 'window' object of the page. - QVariant getContentWindowObject(); - - virtual void connectAll(); - virtual void activate(); - virtual void deactivate(); - - QString title() const { return webView()->title(); } - QUrl url() { return webView()->url(); } - - qreal getZoomFactor() const; - - WebContentWidget *webView() const { return m_widget; } - - static ControllableView* createNew(QWidget *parent); - - /*! connect objects titleChanged(const QString& title) signal - * !param receiver connect receiver object - * !param method object slot to connect - */ - virtual void connectTitleChanged(const QObject* receiver, const char* method) - { connect( this,SIGNAL(titleChanged),receiver,method ); } - - - /*! connect objects ContextChanged() signal - * !param receiver connect receiver object - * !param method object slot to connect - */ - virtual void connectContextChanged(const QObject* receiver, const char* method) - { connect( this,SIGNAL(ContextChanged),receiver,method ); } - - /*! - Return the list of public QActions most relevant to the view's current context - (most approptiate for contextual menus, etc. - */ - virtual QList<QAction*> getContext(); - - QWebPage* wrtPage() { return m_widget->wrtPage(); } - void scrollViewBy(int dx, int dy); - void scrollViewTo(int x, int y); - - void changeZoomAction(qreal zoom); - void deactivateZoomActions(); - - void bitmapZoomStop(); -signals: - void titleChanged(const QString& title); - void ContextChanged(); - -public slots: - void zoomIn(qreal factor = 0.1); - void zoomOut(qreal factor = 0.1); - void setZoomFactor(qreal factor); - void showMessageBox(WRT::MessageBoxProxy* data); - void zoomP(); - void zoomN(); -protected: - WebContentWidget *webViewConst() const { return m_widget; } - -protected: - WebContentWidget *m_widget; - QNetworkAccessManager *m_networkMgr; //Owned - // NetworkAccessManager *m_networkMgr; //Owned -// FlickCharm* m_flickCharm; //Owned - -private: - - void setZoomActions(); - - QAction * m_actionZoomIn; - QAction * m_actionZoomOut; - QTimer *m_timer; - qreal m_value; -}; - -// ---------------------------------------------------------- - -/*! - \brief This class provides the javascript API to WebContentViews. - \sa WebContentView - */ -class BWF_EXPORT WebContentViewJSObject : public ControllableViewJSObject { - Q_OBJECT - public: - WebContentViewJSObject(WebContentView *contentView, QWebFrame *chromeFrame) - : ControllableViewJSObject(contentView, chromeFrame, "webView") - { - } - - qreal getZoomFactor() const { return webContentViewConst()->getZoomFactor(); } - void setZoomFactor(qreal factor) { webContentView()->setZoomFactor(factor); } - Q_PROPERTY(qreal zoomFactor READ getZoomFactor WRITE setZoomFactor) - -public slots: - void zoomIn(qreal deltaPercent = 0.1) { webContentView()->zoomIn(deltaPercent); } - void zoomOut(qreal deltaPercent = 0.1) { webContentView()->zoomOut(deltaPercent); } - -signals: - void onStatusBarMessage( const QString & text ); - void onStatusBarVisibilityChangeRequested(bool visible); - - // Sent when the display mode changes from landscape to protrait or vice versa. - void onDisplayModeChanged(const QString &orientation); - - void contextEvent(QObject *context); - -private slots: - void statusBarMessage( const QString & text ); - void statusBarVisibilityChangeRequested(bool visible); - void onContextEvent(WebViewEventContext *context); - -protected: - WebContentView *webContentView() { return static_cast<WebContentView *>(m_contentView); } - WebContentView *webContentViewConst() const { return static_cast<WebContentView *>(m_contentView); } -}; - -#endif // WEBCONTENTVIEW_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/Common.pri --- a/browsercore/appfw/Common/Common.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Common/Common.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,24 +1,27 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # HEADERS += \ $$PWD/FlowInterface.h \ $$PWD/PictureFlow.h \ - $$PWD/FilmstripFlow.h \ - $$PWD/wrttypes.h + $$PWD/FilmstripFlow.h SOURCES += \ $$PWD/PictureFlow.cpp \ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/FilmstripFlow.cpp --- a/browsercore/appfw/Common/FilmstripFlow.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Common/FilmstripFlow.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,24 @@ /* * 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. -* -* Contributors: +* 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. * -* Description: +* 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: +* +* FilmstripFlow - animated image show widget */ - #include <QDebug> #include <QImage> #include <QPainter> @@ -222,7 +226,8 @@ QRectF target = m_movie->movieClip(0); int w = target.width(); int h = target.height(); - m_name = qtTrId("txt_browser_windows_new_window"); + if (m_name.isEmpty()) + m_name = qtTrId("txt_browser_windows_new_window"); m_img = QImage(w, h, QImage::Format_RGB32); QPainter painter(&m_img); @@ -1250,7 +1255,7 @@ */ void GraphicsFilmstripFlow::setCenterIndex(int i) { - qDebug() << "!!!Set Center Index:" << i; + //qDebug() << "!!!Set Center Index:" << i; Q_ASSERT(d); if (!d->m_films.size()) return; @@ -1646,7 +1651,9 @@ return; if(event->pos().x() > ( (size().width() - d->m_centerWindowSize.width())/ 2) && - event->pos().x() < ( (size().width() + d->m_centerWindowSize.width())/ 2) ) + event->pos().x() < ( (size().width() + d->m_centerWindowSize.width())/ 2) && + event->pos().y() > d->m_centerTopSpace && + event->pos().y() < d->m_centerTopSpace + d->m_centerWindowSize.height()) { emit ok(d->m_centerIndex); } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/FilmstripFlow.h --- a/browsercore/appfw/Common/FilmstripFlow.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Common/FilmstripFlow.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,25 @@ /* * 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. -* -* Contributors: +* 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. * -* Description: +* 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: +* +* FilmstripFlow - animated image show widget */ - #ifndef FILMSTRIPFLOW_H #define FILMSTRIPFLOW_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/FlowInterface.h --- a/browsercore/appfw/Common/FlowInterface.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/Common/FlowInterface.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * 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 __FLOWBASE_H__ #define __FLOWBASE_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/VisualFlowLite.cpp --- a/browsercore/appfw/Common/VisualFlowLite.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,498 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -// INCLUDE FILES -#include "VisualFlowLite.h" - -#include <QTimer> -#include <QPainter> -#include <QKeyEvent> -#include <QMouseEvent> - -#include <QDebug> - - -// CONSTANTS -const int KVisualFlowViewOffsetX = 2; - -//Animation related factors -const int KResizeFactorIncr = 20; -const int KAnimFactorInc = 25; -const int KFastScrollAnimFactorInc = 40; -const int KMaxAnimFactor = 100; -const int KMinAnimFactor = 0; - -const int KRepaintTimerCb = 20; -const int KCenterThumbnailWidthPercent = 50; -const int KCenterThumbnailHeightPercent = 90; -const int KSideThumbnailWidthPercent = 25; -const int KSideThumbnailHeightPercent = 70; - -#define KCenterImageBorderColor Qt::red -#define KSideImageBorderColor Qt::black - - -namespace WRT { -const int KScrollTimeout = 200; - - -VisualFlowLite::VisualFlowLite(QWidget* parent) : FlowInterface(parent), - m_resizeFactor (KMinAnimFactor), - m_placeHolderResizeFactor(KMinAnimFactor), - m_centerPageIndex(-1), - m_scalingAllowed(false) -{ - m_paintState = paintStateNormal; - m_scrollTimer = NULL; -} - -void VisualFlowLite::init() -{ - m_repaintTimer = new QTimer; - connect(m_repaintTimer, SIGNAL(timeout()), this, SLOT(calcRepaintRect())); - resize(parentWidget()->rect().size()); - - m_repaintTimer->start(KRepaintTimerCb); - // FIXME: Cursor undef for symbian? -#if !defined(Q_OS_SYMBIAN) - setCursor(Qt::ArrowCursor); -#endif - setFocusPolicy(Qt::WheelFocus); - setFocus(Qt::OtherFocusReason); -} - -void VisualFlowLite::addSlide(const QImage& image) -{ - m_imageList.append(new QImage(image)); -} - -void VisualFlowLite::clear() -{ - if (m_repaintTimer->isActive()) { - m_repaintTimer->stop(); - } - while (!m_imageList.isEmpty()) - delete m_imageList.takeFirst(); - if (m_scrollTimer) { - m_scrollTimer->stop(); - } - - m_paintState = paintStateNormal; - m_direction = 0; - m_repaintTimer->start(KRepaintTimerCb); -} - -int VisualFlowLite::slideCount() const -{ - return m_imageList.count(); -} - -QImage VisualFlowLite::slide(int index) const -{ - const QImage* i = 0; - if((index >= 0) && (index < m_imageList.count())) - i = m_imageList.at(index); - return i ? QImage(*i) : QImage(); -} - -void VisualFlowLite::setCenterIndex(int i) -{ - setCurrentIndex(i); -} - -int VisualFlowLite::centerIndex() const -{ - return m_centerPageIndex; -} - -bool VisualFlowLite::slideAnimationOngoing() const -{ - return m_repaintTimer->isActive(); -} - -void VisualFlowLite::setCenterThumbnail(int i) -{ - if(m_centerPageIndex + 1 == i) { - showNext(); - } - else if(m_centerPageIndex - 1 == i) { - showPrevious(); - } - else { - setCurrentIndex(i); - calculateLayout(); - update(); - } - -} - -void VisualFlowLite::setCurrentIndex(int i) -{ - m_currentIndex = i; - m_centerPageIndex = i; -} - -VisualFlowLite::~VisualFlowLite() -{ - if (m_repaintTimer->isActive()) { - m_repaintTimer->stop(); - } - delete m_repaintTimer; - while (!m_imageList.isEmpty()) - delete m_imageList.takeFirst(); - if (m_scrollTimer) { - m_scrollTimer->stop(); - delete m_scrollTimer; - } -} - -bool VisualFlowLite::calcRepaintRect() -{ - m_repaintTimer->stop(); - disconnect(m_repaintTimer, SIGNAL(timeout()), this, SLOT(calcRepaintRect())); - connect(m_repaintTimer, SIGNAL(timeout()), this, SLOT(animatePlaceHolderPosition())); - if (m_resizeFactor == KMaxAnimFactor) { - m_repaintRect.setRect(rect().x(), rect().y(), rect().width(), rect().height()); - update(); - return false; - } - m_repaintRect.setRect(rect().x(), rect().y(), rect().width() * m_resizeFactor/100, rect().height() * m_resizeFactor/100); - m_resizeFactor += KResizeFactorIncr; - update(); - return true; -} - -void VisualFlowLite::keyPressEvent(QKeyEvent* event) -{ - switch (event->key()) { - case Qt::Key_Left: - showPrevious(); - break; - case Qt::Key_Right: - showNext(); - break; - case Qt::Key_Escape: - emit cancel(); - break; - case Qt::Key_Enter: - case Qt::Key_Return: - case Qt::Key_Select: - emit ok(m_currentIndex); - break; - } -} - -void VisualFlowLite::mousePressEvent(QMouseEvent* event) -{ - m_lastMoveEventPos = event->pos(); - m_scrollTimer = new QTimer; - connect(m_scrollTimer, SIGNAL(timeout()), this, SLOT(scroll())); - m_scrollTimer->start(KScrollTimeout); - scroll(); -} - -void VisualFlowLite::mouseMoveEvent(QMouseEvent* event) -{ - m_lastMoveEventPos = event->pos(); -} - -void VisualFlowLite::mouseReleaseEvent(QMouseEvent* event) -{ - m_scrollTimer->stop(); - delete m_scrollTimer; - m_scrollTimer = NULL; - if (slideAnimationOngoing()) { -// qDebug() << "vfl:mouseReleaseEvent slideanimation running, ignoring click"; - return; - } - if (event->x() > m_centerPlaceHolderRect.left() && event->x() < m_centerPlaceHolderRect.right()) { - emit ok(centerIndex()); - } -} - -void VisualFlowLite::scroll() -{ - if (m_lastMoveEventPos.x() < m_leftPlaceHolderRect.right()) - showPrevious(); - else if (m_lastMoveEventPos.x() > m_rightPlaceHolderRect.left()) - showNext(); -} - -void VisualFlowLite::paintEvent(QPaintEvent* event) -{ - if (m_paintState == paintStateNormal) { - paintNormalState(event); - } - else if (m_paintState == paintStateInTransition) { - paintInTransition(event); - } -} - -void VisualFlowLite::paintNormalState(QPaintEvent* event) -{ - int imageCount = m_imageList.count(); - const QImage* centerEntry = (m_centerPageIndex >= 0)&&(imageCount>0) ? (m_imageList.at(m_centerPageIndex)) : NULL; - const QImage* leftEntry = (m_centerPageIndex - 1 >= 0)&&(imageCount>0) ? (m_imageList.at(m_centerPageIndex - 1)) : NULL; - const QImage* rightEntry = (m_centerPageIndex + 1 < imageCount) ? (m_imageList.at(m_centerPageIndex + 1)) : NULL; - - QPainter painter(this); - painter.save(); - painter.setBrush(Qt::white); - painter.drawRect(rect()); - painter.setBrush(Qt::NoBrush); - if (leftEntry) { - //painter.drawImage(m_leftPlaceHolderRect.topLeft(), *leftEntry, QRect(QPoint(0, 0), m_leftPlaceHolderRect.size())); - paintImage(&painter, m_leftPlaceHolderRect, *leftEntry); - - painter.setPen(KSideImageBorderColor); - painter.drawRect(m_leftPlaceHolderRect); - } - if (rightEntry) { - //painter.drawImage(m_rightPlaceHolderRect.topLeft(), *rightEntry, QRect(QPoint(0, 0), m_rightPlaceHolderRect.size())); - paintImage(&painter, m_rightPlaceHolderRect, *rightEntry); - - painter.setPen(KSideImageBorderColor); - painter.drawRect(m_rightPlaceHolderRect); - } - if (centerEntry ) { - //painter.drawImage(m_centerPlaceHolderRect.topLeft(), *centerEntry, QRect(QPoint(0, 0), m_centerPlaceHolderRect.size())); - paintImage(&painter, m_centerPlaceHolderRect, *centerEntry); - } - painter.setPen(KCenterImageBorderColor); - painter.drawRect(m_centerPlaceHolderRect); - painter.restore(); -} - -void VisualFlowLite::resizeEvent(QResizeEvent* event) -{ - calculateLayout(); - update(); -} - -void VisualFlowLite::calculateLayout() -{ - QSize screenSize = rect().size(); - //QSize screenSize = sizeHint(); - - QSize viewSize((screenSize.width() - 2 * KVisualFlowViewOffsetX), screenSize.height()); - int centerImageWidth(viewSize.width() * KCenterThumbnailWidthPercent / 100); - int centerImageHeight(viewSize.height() * KCenterThumbnailHeightPercent/100); - QSize centerImageSize(centerImageWidth, centerImageHeight); - - int sideImageWidth(viewSize.width() * KSideThumbnailWidthPercent/100); - int sideImageHeight(viewSize.height() * KSideThumbnailHeightPercent/100); - QSize sideImageSize(sideImageWidth, sideImageHeight); - - int centerImageX(KVisualFlowViewOffsetX + sideImageWidth); - int centerImageY(viewSize.height() * (100 - KCenterThumbnailHeightPercent) / (2 * 100)); - QPoint centerImageOrigin(centerImageX, centerImageY); - - m_centerPlaceHolderRect.setRect(centerImageOrigin.x(), centerImageOrigin.y(), centerImageSize.width(), centerImageSize.height()); - int sideImageY(viewSize.height() * (100 - KSideThumbnailHeightPercent) / (2 * 100)); - QPoint leftThumbnailOrigin(KVisualFlowViewOffsetX, sideImageY ); - QPoint rightThumbnailOrigin((int)(KVisualFlowViewOffsetX + sideImageWidth + centerImageWidth), sideImageY ); - - m_leftPlaceHolderRect.setRect(leftThumbnailOrigin.x(), leftThumbnailOrigin.y(), sideImageSize.width(), sideImageSize.height()); - m_rightPlaceHolderRect.setRect(rightThumbnailOrigin.x(), rightThumbnailOrigin.y(), sideImageSize.width(), sideImageSize.height()); -} - -bool VisualFlowLite::animatePlaceHolderPosition() -{ - m_repaintTimer->stop(); - if (m_placeHolderResizeFactor >= KMaxAnimFactor) { - //Restore old values and end AO - if (m_direction == 1) { - m_centerPageIndex++; - } - if (m_direction == -1) { - m_centerPageIndex--; - } - m_placeHolderResizeFactor = 0; - m_direction = 0; - m_paintState = paintStateNormal; - update(); - emit centerIndexChanged(m_centerPageIndex); - return false; - } - update(); - return true; -} - -void VisualFlowLite::paintInTransition(QPaintEvent* event) -{ - QRect rects[4]; - int dw = 0; - int dh = 0; - int dx = 0; - //left movement - if (m_direction == -1) { - QPoint pt(m_leftPlaceHolderRect.x(), m_leftPlaceHolderRect.y() + m_leftPlaceHolderRect.height() / 2); - dw = m_leftPlaceHolderRect.width() * m_placeHolderResizeFactor / 200; - dh = m_leftPlaceHolderRect.height() * m_placeHolderResizeFactor / 200; - rects[0].setRect(pt.x(), pt.y() - dh, 2 * dw, 2 * dh); - - dx = (m_centerPlaceHolderRect.x() - m_leftPlaceHolderRect.x()) * m_placeHolderResizeFactor / 100; - dw = (m_centerPlaceHolderRect.width() - m_leftPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_centerPlaceHolderRect.height() - m_leftPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[1].setRect(m_leftPlaceHolderRect.x() + dx, m_leftPlaceHolderRect.y() - dh, m_leftPlaceHolderRect.width() + 2 * dw, m_leftPlaceHolderRect.height() + 2 * dh); - - dx = (m_rightPlaceHolderRect.x() - m_centerPlaceHolderRect.x()) * m_placeHolderResizeFactor / 100; - dw = (m_centerPlaceHolderRect.width() - m_rightPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_centerPlaceHolderRect.height() - m_rightPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[2].setRect(m_centerPlaceHolderRect.x() + dx, m_centerPlaceHolderRect.y() + dh, m_centerPlaceHolderRect.width() - 2 * dw, m_centerPlaceHolderRect.height() - 2 * dh); - - dw = (m_rightPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_rightPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[3].setRect(m_rightPlaceHolderRect.x() + 3 * dw, m_rightPlaceHolderRect.y() + dh, m_rightPlaceHolderRect.width() - 2 * dw, m_rightPlaceHolderRect.height() - 2 * dh); - - const QImage* item = 0; - QPainter painter(this); - painter.setPen(Qt::NoPen); - QBrush whiteBrush(Qt::white, Qt::SolidPattern); - painter.setBrush(whiteBrush); - painter.drawRect(rect()); - - for (int i = 0; i < 4; i++) { - item = (m_centerPageIndex - 2 + i >= 0 && m_centerPageIndex - 2 + i < m_imageList.count()) ? - m_imageList.at(m_centerPageIndex - 2 + i) : NULL; - if (item) { - QRect intersectRect(rect()); - intersectRect = intersectRect.intersected(rects[i]); - if (!intersectRect.isEmpty()) { - //painter.drawImage(intersectRect.topLeft(), *item, QRect(0, 0, rects[i].width(), rects[i].height())); - paintImage(&painter, intersectRect, *item); - - QPen sideImagePen(KSideImageBorderColor); - sideImagePen.setStyle(Qt::SolidLine); - painter.setPen(sideImagePen); - painter.setBrush(Qt::NoBrush); - painter.drawRect(intersectRect); - } - } - } - } - - if (m_direction == 1) { - dw = m_leftPlaceHolderRect.width() * m_placeHolderResizeFactor / 200; - dh = m_leftPlaceHolderRect.height() * m_placeHolderResizeFactor / 200; - rects[0].setRect(m_leftPlaceHolderRect.x() + 3 * dw, m_leftPlaceHolderRect.y() + dh, m_leftPlaceHolderRect.width() - 2 * dw, m_leftPlaceHolderRect.height() - 2 * dh); - - dx = (m_centerPlaceHolderRect.x() - m_leftPlaceHolderRect.x()) * m_placeHolderResizeFactor / 100; - dw = (m_centerPlaceHolderRect.width() - m_leftPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_centerPlaceHolderRect.height() - m_leftPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[1].setRect(m_centerPlaceHolderRect.x() - dx, m_centerPlaceHolderRect.y() + dh, m_centerPlaceHolderRect.width() - 2 * dw, m_centerPlaceHolderRect.height() - 2 * dh); - - dx = (m_rightPlaceHolderRect.x() - m_centerPlaceHolderRect.x()) * m_placeHolderResizeFactor / 100; - dw = (m_centerPlaceHolderRect.width() - m_rightPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_centerPlaceHolderRect.height() - m_rightPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[2].setRect(m_rightPlaceHolderRect.x() - dx, m_rightPlaceHolderRect.y() -dh, m_rightPlaceHolderRect.width() + 2 * dw, m_rightPlaceHolderRect.height() + 2 * dh); - - QPoint pt(m_rightPlaceHolderRect.x() + m_rightPlaceHolderRect.width(), m_rightPlaceHolderRect.y() + m_rightPlaceHolderRect.height() / 2); - dw = (m_rightPlaceHolderRect.width()) * m_placeHolderResizeFactor / 200; - dh = (m_rightPlaceHolderRect.height()) * m_placeHolderResizeFactor / 200; - rects[3].setRect(pt.x() - 2 * dw, pt.y() - dh, pt.x(), pt.y() + 2 * dh); - - const QImage* item = 0; - QPainter painter(this); - painter.setPen(Qt::NoPen); - QBrush whiteBrush(Qt::white, Qt::SolidPattern); - painter.setBrush(whiteBrush); - painter.drawRect(rect()); - - for (int i = 0; i < 4; i++) { - item = (m_centerPageIndex - 1 + i >= 0 && m_centerPageIndex - 1 + i < m_imageList.count()) ? - m_imageList.at(m_centerPageIndex - 1 + i) : NULL; - if (item) { - QRect intersectRect(rect()); - intersectRect = intersectRect.intersected(rects[i]); - if (!intersectRect.isEmpty()) { - //painter.drawImage(intersectRect.topLeft(), *item, QRect(0, 0, rects[i].width(), rects[i].height())); - paintImage(&painter, intersectRect, *item); - - QPen sideImagePen(KSideImageBorderColor); - sideImagePen.setStyle(Qt::SolidLine); - painter.setPen(sideImagePen); - painter.setBrush(Qt::NoBrush); - painter.drawRect(intersectRect); - } - } - } - } - if (!m_fastScroll) { - m_placeHolderResizeFactor += KAnimFactorInc; - } - else { - m_placeHolderResizeFactor += KFastScrollAnimFactorInc; - } - m_repaintTimer->start(KRepaintTimerCb); -} - -void VisualFlowLite::showPrevious() -{ - if (m_centerPageIndex > 0) { - if (m_repaintTimer->isActive()) { - m_repaintTimer->stop(); - m_resizeFactor = KMaxAnimFactor; - } - m_paintState = paintStateInTransition; - m_direction = -1; - m_repaintTimer->start(KRepaintTimerCb); - } -} - -void VisualFlowLite::showNext() -{ - int count = m_imageList.count(); - if (m_centerPageIndex < ( count -1 )) { - if (m_repaintTimer->isActive()) { - m_repaintTimer->stop(); - m_resizeFactor = KMaxAnimFactor; - } - m_paintState = paintStateInTransition; - m_direction = 1; - m_repaintTimer->start(KRepaintTimerCb); - } -} - -void VisualFlowLite::paintImage(QPainter* painter, QRect rect, QImage image) -{ - // scaling images up does not look good so we only scale down if image is too big - bool shouldScale(false); - if (m_scalingAllowed) - shouldScale = (image.height() > rect.height() || image.width() > rect.width()); // scale down needed - - - QImage img = (shouldScale) ? image.scaled(rect.width(), rect.height(), Qt::KeepAspectRatio) : image; - - int originX = rect.topLeft().x(); - int originY = rect.topLeft().y(); - // center the image if needed - if (rect.width() > img.width()) - originX += (rect.width() - img.width()) / 2; - if (rect.height() > img.height()) - originY += (rect.height() - img.height()) / 2; - - painter->drawImage(QPoint(originX, originY), img, QRect(QPoint(0, 0), rect.size())); -} - -QRect VisualFlowLite::centralRect() const -{ - return QRect(); -} - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/VisualFlowLite.h --- a/browsercore/appfw/Common/VisualFlowLite.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef VISUALFLOWLITE_H -#define VISUALFLOWLITE_H - -#include <QWidget> -#include <QKeyEvent> -#include "FlowInterface.h" - -class QPainter; - -namespace WRT { - -class VisualFlowLite : public FlowInterface -{ -Q_OBJECT -public: - VisualFlowLite(QWidget* parent); - void init(); - void addSlide(const QImage& image); - void clear(); - int slideCount() const; - QImage slide(int index) const; - void setCenterIndex(int i); - int centerIndex() const; - bool slideAnimationOngoing() const; - void setCenterThumbnail(int i); - void setCurrentIndex(int i); - virtual ~VisualFlowLite(); - void keyPressEvent(QKeyEvent* event); - void paintEvent(QPaintEvent* event); - void calculateLayout(); - void showPrevious(); - void showNext(); - void paintNormalState(QPaintEvent* event); - void paintInTransition(QPaintEvent* event); - void setImagesScaled(bool scaled) { m_scalingAllowed = scaled; } - QRect centralRect() const; - -signals: - void centerIndexChanged(int index); - void ok(int index); - void cancel(); - -public slots: - bool calcRepaintRect(); - bool animatePlaceHolderPosition(); - void scroll(); - -protected: - void mousePressEvent(QMouseEvent* event); - void resizeEvent(QResizeEvent* event); - void mouseMoveEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); - -private: - enum PaintState { - paintStateNormal, - paintStateInTransition - }; - - void paintImage(QPainter* painter, QRect rect, QImage image); - - // indicates the index of the center thumbnail - int m_centerPageIndex; - QRect m_offscreenRect; - // represents the entry corresponding to the selected page in view - // timer used to do animation - QTimer* m_repaintTimer; - //repaint rect using during animating initial display of the view - QRect m_repaintRect; - //resize factor applied during initial display animation - int m_resizeFactor; - //left place holder rectangle - QRect m_leftPlaceHolderRect; - //left place holder rectangle - QRect m_centerPlaceHolderRect; - //left place holder rectangle - QRect m_rightPlaceHolderRect; - //Left Arrow position - QPoint m_leftArrow[3]; - //Right arrow position - QPoint m_rightArrow[3]; - //Factor used during animation of place holders - int m_placeHolderResizeFactor; - //Direction of movement - int m_direction; - //Flag to check if fast animation is needed or not - bool m_fastScroll; - PaintState m_paintState; - // Initial position - int m_currentIndex; - QList<const QImage*> m_imageList; - QPoint m_lastMoveEventPos; - QTimer* m_scrollTimer; - bool m_scalingAllowed; -}; - -} -#endif // VISUALFLOWLITE_H - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/Common/wrttypes.h --- a/browsercore/appfw/Common/wrttypes.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __WRTTYPES_H__ -#define __WRTTYPES_H__ - -namespace WRT { - - /*! - This id specifies a WRT view id - */ - enum WrtViewId { - ContentViewId = 0, //!< The ContentView (i.e., web pages) - HistoryViewId, //!< The history of visited pages - ThumbnailViewId, //!< A miniature, navigable view of the current page - BookmarksViewId, //!< A view to manage bookmarks - ShowImagesViewId, //!< A view that lists images available on the current page - NullViewId //!< Dummy View Id, This must be the last ID, the array of view handlers depends on it - }; - - /*! - This is a bitmask describing what the view can or cannot do - */ - enum ViewCapabilities { - ViewCanCancel = 1, //!< The view can be cancelled - ViewCanClose = 2 //!< The view can be closed - }; - -} -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/ThumbnailEngine.pri --- a/browsercore/appfw/ThumbnailEngine/ThumbnailEngine.pri Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# -# Copyright (c) 2010 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. -# -# Contributors: -# -# Description: -# - -HEADERS += \ - $$PWD/TnEngineGenerator.h \ - $$PWD/TnEngineHandler.h \ - $$PWD/TnEngineScaler.h \ - $$PWD/TnEngineView.h - -SOURCES += \ - $$PWD/TnEngineGenerator.cpp \ - $$PWD/TnEngineHandler.cpp \ - $$PWD/TnEngineScaler.cpp \ - $$PWD/TnEngineView.cpp - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineGenerator.cpp --- a/browsercore/appfw/ThumbnailEngine/TnEngineGenerator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,405 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QPainter> -#include "qdebug.h" - -#include "TnEngineGenerator.h" -#include "TnEngineHandler.h" - -const int KUnscaledBitmapSize = 1024*128; // pixels, = 128kB -#if defined Q_WS_MAC || defined Q_WS_WIN || defined Q_WS_X11 -const int KBufferBitmapSize = 1024*2048;// pixels, = 2MB -#else -const int KBufferBitmapSize = 1024*374;// pixels, = 374kB -#endif -const int KMaxDocWidth = 1200; // limit the maximum width the TnEngine covers -const int KExtraUpdateHeightTop = 100; // hq update this much pixels outsize the view -const int KExtraUpdateHeightBottom = 300; // hq update this much pixels outsize the view -const int KExtraLQUpdateHeight = 0; // lq update this much pixels outsize the view - -namespace WRT { - -TnEngineGenerator::TnEngineGenerator(TnEngineHandler& TnEngine) -: m_TnEngine(&TnEngine), -m_validLQRegion(QRegion()), m_validHQRegion(QRegion()), m_bufferPos(0, 0), m_docSize(0, 0), m_keepsBitmaps(false) -{ - m_unscaledBitmap = 0; - m_bufferBitmap = 0; - m_asyncUpdateStarted = 0; -} - -void TnEngineGenerator::init() -{ - m_scaler = TnEngineScaler::initWithCallback(*this); - m_asyncUpdateStarted = new QTimer; - connect(m_asyncUpdateStarted, SIGNAL(timeout()), this, SLOT(startAsyncBufferUpdate())); -} - -TnEngineGenerator* TnEngineGenerator::initWithTnEngine(TnEngineHandler& TnEngine) -{ - TnEngineGenerator* self = new TnEngineGenerator(TnEngine); - self->init(); - return self; -} - -TnEngineGenerator::~TnEngineGenerator() -{ -#ifdef __OOM__ - delete iOOMCollector; -#endif - deleteUnscaledBitmap(); - deleteBufferBitmap(); - delete m_scaler; - delete m_asyncUpdateStarted; - m_validLQRegion = QRegion(); - m_validHQRegion = QRegion(); -} - -void TnEngineGenerator::scalingCompleted(QPixmap& result, const QRect& targetRect) -{ - if (!m_bufferBitmap) { - return; - } - QRect target(targetRect); - QRect bufrect(bufferRect()); - // maybe the buffer has been scrolled out while scaling was going on? - if (target.intersects(bufrect)) { - // update the valid reqion - m_validHQRegion += (target); - m_validHQRegion = m_validHQRegion.intersected (bufrect); - - // blit the newly scaled area to correct position in buffer - target.moveTo(target.topLeft()-m_bufferPos); - QPainter painter(m_bufferBitmap); - painter.drawPixmap(target.topLeft(), result); - } - // search for next stripe to update - bool more = startAsyncBufferUpdate(); - - // delete unscaled bitmap if nothing more to do - if (!more && !m_keepsBitmaps) { - deleteUnscaledBitmap(); - } - - // signal the update - m_TnEngine->scaledPageChanged(m_TnEngine->theRect(), !more /*aReady*/, false); -} - - -void TnEngineGenerator::invalidate() -{ - QSize docSize(m_TnEngine->documentSize()); - // if doc width changes, assume larger changes and invalidate low quality buffer too - if (docSize.width()!=m_docSize.width() || (!m_TnEngine->isDocumentComplete() && m_TnEngine->isFullScreenMode())) - { - m_validLQRegion = QRegion(); - } - m_docSize = docSize; - // otherwise only invalidate high quality areas to avoid lq<->hq flicker - m_validHQRegion = QRegion(); -} - - -void TnEngineGenerator::update(bool scrolling) -{ - bool changes = fastBufferUpdate(); - if (changes && m_scaler->isActive()) { - // fastBufferUpdate uses the same bitmap, scaling op is no longer valid, have to cancel - m_scaler->cancel(); - } - // if scaler is already active no need to restart it - if (m_TnEngine->isDocumentComplete() && !m_asyncUpdateStarted->isActive() -#ifdef __OOM__ - && !iOOMCollector->IsCollecting() -#endif - ) { - m_asyncUpdateStarted->start(0); - } - if (changes) { - m_TnEngine->scaledPageChanged(m_TnEngine->theRect(), true, scrolling); - } -} - - -void TnEngineGenerator::scroll() -{ - calcBufferPosition(); -} - - -void TnEngineGenerator::clear() -{ - m_scaler->cancel(); - m_validLQRegion = QRegion(); - m_validHQRegion = QRegion(); - if (m_bufferBitmap) { - delete m_bufferBitmap; - m_bufferBitmap = NULL; - } - if (m_unscaledBitmap) { - delete m_unscaledBitmap; - m_unscaledBitmap = NULL; - } - m_bufferPos = QPoint(0,0); - m_docSize = QSize(0,0); -} - - -void TnEngineGenerator::calcBufferPosition() -{ - if (!m_bufferBitmap) { - return; - } - QRect vpr(m_TnEngine->viewportOnTnEngine()); - QPoint vpc(vpr.center()); - QRect bufrect(bufferRect()); - QSize bufsize(bufrect.size()); - QPoint newPos(bufrect.topLeft()); - QSize mmdocSize(m_TnEngine->fromDocCoords(m_docSize)); - - // check if view is outside center 1/3 of the buffer - if (vpc.y()<m_bufferPos.y()+bufsize.height()/3 || - vpc.y()>m_bufferPos.y()+bufsize.height()*2/3 ) { - // recalc new pos - newPos.setY(vpc.y() - bufsize.height()/2); - if (newPos.y()+bufsize.height()>mmdocSize.height()) - newPos.setY(mmdocSize.height()-bufsize.height()); - if (newPos.y()<0) - newPos.setY(0); - } - - // scroll the buffer if needed - int scrollAmount = newPos.y()-m_bufferPos.y(); - if (scrollAmount!=0) { - // check if we need to move bitmap - if (scrollAmount>0 && scrollAmount<bufsize.height()) { - // scroll buffer down - QRect from (QPoint(0,scrollAmount), QSize(bufsize.width(), bufsize.height()-scrollAmount)); - // copy area that remains in buffer to a new position - QPainter painter(m_bufferBitmap); - painter.drawPixmap(QPoint(0,0), *m_bufferBitmap, from); - } - else if (scrollAmount<0 && (-scrollAmount)<bufsize.height()) { - // scroll buffer up - QRect from (QPoint(0,0), QSize(bufsize.width(), bufsize.height()+scrollAmount)); - // copy area that remains in buffer to a new position - QPainter painter(m_bufferBitmap); - painter.drawPixmap(QPoint(0,-scrollAmount), *m_bufferBitmap, from); - } - // invalidate the areas that are out from the buffer due to scrolling - m_validLQRegion = m_validLQRegion.intersected(bufrect); - m_validHQRegion = m_validHQRegion.intersected(bufrect); - } - m_bufferPos = newPos; -} - -bool TnEngineGenerator::fastBufferUpdate() -{ - if (!checkAndCreateBitmaps()) { - return false; - } - - bool changes(false); - - QRect vp(m_TnEngine->viewportOnTnEngine()); - QRect bufrect(bufferRect()); - QSize unscaledSize(m_unscaledBitmap->size()); - - QSize targetSize(m_TnEngine->fromDocCoords(unscaledSize)); - - // divide to unscaled bitmap height stripes - int ypos = ((vp.top() - KExtraLQUpdateHeight)/targetSize.height())*targetSize.height(); - int yend(vp.bottom() + KExtraLQUpdateHeight); - - if (ypos<0) { - ypos = 0; - } - if (yend>bufrect.bottom()) { - yend = bufrect.bottom(); - } - // loop over the view area, checking if this stripe needs an update - while (ypos<yend) { - QRect target(QPoint(0,ypos),targetSize); - QRect from(m_TnEngine->toDocCoords(target).topLeft(),unscaledSize); - - // check if this area is already valid - QRegion tempR; - tempR += (target); - tempR = tempR.intersected(bufrect); - tempR = tempR.subtracted (m_validLQRegion); - tempR = tempR.subtracted (m_validHQRegion); - - if (!tempR.isEmpty()) { - // mark area valid - m_validLQRegion += target; - - m_validLQRegion = m_validLQRegion.intersected(bufrect); - - // if not, get the bitmap from client - QPainter unscaledPainter(m_unscaledBitmap); - m_TnEngine->drawDocumentPart(unscaledPainter, from); - // scale down - target.moveTo(target.topLeft()-m_bufferPos); - QPainter painter(m_bufferBitmap); - painter.drawPixmap(target,*m_unscaledBitmap,QRect(QPoint(0,0), unscaledSize)); - changes = true; - } - tempR = QRegion(); - - ypos += targetSize.height(); - } - return changes; -} - -bool TnEngineGenerator::startAsyncBufferUpdate() -{ - m_asyncUpdateStarted->stop(); - - if (!checkAndCreateBitmaps()) { - return false; - } - - QRect vp(m_TnEngine->viewportOnTnEngine()); - QRect bufrect(bufferRect()); - QSize unscaledSize(m_unscaledBitmap->size()); - - QSize targetSize(m_TnEngine->fromDocCoords(unscaledSize)); - - // divide to unscaled bitmap height stripes - int ypos(((vp.top() - KExtraUpdateHeightTop)/targetSize.height())*targetSize.height()); - int yend(vp.bottom() + KExtraUpdateHeightBottom); - if (ypos<bufrect.top()) { - ypos = bufrect.top(); - } - if (yend>bufrect.bottom()) { - yend = bufrect.bottom(); - } - // loop over the view area, searching for a stripe that needs an update - while (ypos<yend) { - // update this area - QRect target(QPoint(0,ypos),targetSize); - // from here - QRect from(m_TnEngine->toDocCoords(target).topLeft(),unscaledSize); - - // check if this area is already valid in high quality region - QRegion tempR; - tempR += (target); - tempR = tempR.intersected(bufrect); - tempR = tempR.subtracted(m_validHQRegion); - if (!tempR.isEmpty()) { - tempR = QRegion(); - // if not, get the bitmap from client - QPainter painter(m_unscaledBitmap); - m_TnEngine->drawDocumentPart(painter, from); - // scale asynchronously - m_scaler->startScaling(*m_unscaledBitmap,target); - // update started, get out - return true; - } - tempR = QRegion(); - - ypos += targetSize.height(); - } - // nothing to do - return false; -} - -bool TnEngineGenerator::checkAndCreateBitmaps() -{ -#ifdef __OOM__ - if( iOOMCollector->IsCollecting() ) return false; -#endif - - QSize docSize(m_docSize); - // minmap won't cover ridiculously wide document fully in horizontal - // direction to avoid stripes from getting too wide/low - if (docSize.width() > KMaxDocWidth) { - docSize.setWidth(KMaxDocWidth); - } - QSize mmdocSize(m_TnEngine->fromDocCoords(docSize)); - QSize bufsize(0,0); - QSize unscaledsize(0,0); - if (mmdocSize.width()>0 && docSize.width()>0) { - bufsize = QSize(mmdocSize.width(), qMin(mmdocSize.height(),KBufferBitmapSize/mmdocSize.width())); - unscaledsize = QSize(docSize.width(), qMin(docSize.height(),KUnscaledBitmapSize/docSize.width())); - if (!m_unscaledBitmap || unscaledsize != m_unscaledBitmap->size()) { - // cancel scaling since we might delete the bitmap - m_scaler->cancel(); - } - } - - if (m_TnEngine->checkAndCreateBitmap(bufsize,m_bufferBitmap)) { - m_TnEngine->checkAndCreateBitmap(unscaledsize,m_unscaledBitmap); - } - if( !m_bufferBitmap || !m_unscaledBitmap) - { - deleteUnscaledBitmap(); - deleteBufferBitmap(); - } - return ( m_bufferBitmap!=0 ) && ( m_unscaledBitmap!=0 ); -} - -void TnEngineGenerator::deleteUnscaledBitmap() -{ - // stop scaling - m_scaler->cancel(); - delete m_unscaledBitmap; - m_unscaledBitmap = 0; -} - -void TnEngineGenerator::deleteBufferBitmap() -{ - delete m_bufferBitmap; - m_bufferBitmap = 0; -} - -QRect TnEngineGenerator::bufferRect() const -{ - return QRect(m_bufferPos, m_bufferBitmap->size()); -} - -void TnEngineGenerator::setKeepsBitmaps(bool keepsBitmaps) -{ - m_keepsBitmaps = keepsBitmaps; - // delete bitmap if no scaling active - if (!m_keepsBitmaps && !m_scaler->isActive()) { - deleteUnscaledBitmap(); - } -} - -bool TnEngineGenerator::keepsBitmaps() const -{ - return m_keepsBitmaps; -} - -void TnEngineGenerator::draw(QPainter& gc, const QRect& to) const -{ - if (!m_bufferBitmap) { - return; - } - - QRect vp(m_TnEngine->viewportOnTnEngine()); - - QRect from(vp.topLeft()-m_bufferPos, to.size()); - - gc.drawPixmap(to.topLeft(), *m_bufferBitmap, from); -} - -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineGenerator.h --- a/browsercore/appfw/ThumbnailEngine/TnEngineGenerator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef TNENGINEGENERATOR_H -#define TNENGINEGENERATOR_H - -#include <QObject> -#include "TnEngineScaler.h" -class QPainter; -class QPixmap; -class QTimer; - - -namespace WRT { - -class TnEngineHandler; - -class TnEngineGenerator : public MTnEngineScalerCallback -{ -Q_OBJECT -public: - static TnEngineGenerator* initWithTnEngine(TnEngineHandler& TnEngine); - virtual ~TnEngineGenerator(); - -public: - void setKeepBitmap(bool keepBitmaps); - void invalidate(); - void update(bool scrolling=false); - void scroll(); - void clear(); - void draw(QPainter& gc, const QRect& to) const; - void setKeepsBitmaps(bool keepBitmaps); - bool keepsBitmaps() const; - -private: - void scalingCompleted(QPixmap& result, const QRect& targetRect); - -public slots: - bool startAsyncBufferUpdate(); -public: - void deleteUnscaledBitmap(); - void deleteBufferBitmap(); - -private: - bool fastBufferUpdate(); - bool checkAndCreateBitmaps(); - void invalidateBuffers(); - void calcBufferPosition(); - QRect bufferRect() const; - -private: - TnEngineGenerator(TnEngineHandler& TnEngine); - void init(); - -private: - - TnEngineHandler* m_TnEngine; - TnEngineScaler* m_scaler; - QPixmap* m_unscaledBitmap; - QPixmap* m_bufferBitmap; - QRegion m_validLQRegion; - QRegion m_validHQRegion; - QPoint m_bufferPos; - QSize m_docSize; - bool m_keepsBitmaps; - QTimer* m_asyncUpdateStarted; -}; - -} - -#endif // TnEngineGENERATOR_H - -// End of File diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineHandler.cpp --- a/browsercore/appfw/ThumbnailEngine/TnEngineHandler.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,607 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QPen> -#include <QBrush> -#include <QPainter> -#include "webcontentview.h" -#include "TnEngineHandler.h" -#include "TnEngineView.h" -#include "TnEngineGenerator.h" -#include "WrtPageManager.h" -#include "wrtbrowsercontainer.h" -#include "qwebframe.h" -#include <QDebug> - -namespace WRT { - -const int KDefaultZoomOutPercent = 250; // 2.5x TnEngine zoom out by default - -// defines a box relative to TnEngine edges. if view center goes outside this box -// the view is recentered (50%==always center) -const int KHScrollAreaPercent = 33; // horizontal distance in percent -const int KVScrollAreaPercent = 50; // verical distance in percent -const int KHScrollAreaPercentWithTouch1 = 20; // horizontal distance in percent when to scroll -const int KVScrollAreaPercentWithTouch1 = 20; // verical distance in percent when to scroll -const int KHScrollAreaPercentWithTouch2 = 25; // horizontal distance in percent amount to scroll (scroll to the right only) -const int KVScrollAreaPercentWithTouch2 = 25; // verical distance in percent amount to scroll (scroll up only) -const int KUpdateDelayComplete = 45000; // 45s -const int KUpdateDelayLoading = 7000; // 7s -const int KUpdateDelayFullScreen = 4000; // 4s -const int KUpdateCbDelayComplete = 100; // 0.1s -const int KUpdateCbDelayLoading = 1000; // 1s - -TnEngineHandler::TnEngineHandler(WrtPageManager * mgr, QWidget * parent) - : m_pageMgr(mgr), - m_zoomOutLevel(KDefaultZoomOutPercent), - m_needsUpdate(false), - m_documentComplete(false), - m_fullScreenMode(false), - m_pageScalerUpdating(false), - m_activePage(NULL), - m_parentWidget(parent) -{ - m_TnEngineView = NULL; - m_generator = NULL; - m_updateCbTimer = NULL; - m_updateTimer = NULL; - - activate(); -} - -TnEngineHandler::~TnEngineHandler() -{ - deactivate(); -} - -QRect TnEngineHandler::containerRect() const -{ - return m_containerRect; -} - -QRect TnEngineHandler::TnEngineRect() const -{ - QSize s(calcSize()); - //center - QPoint p((m_containerRect.width()-s.width())/2,(m_containerRect.height()-s.height())/2); - return QRect(p,s); -} - -QRect TnEngineHandler::indicatorRect() const -{ - QRect vp(documentViewport()); - QRect TnEngineVp(viewportOnDocument()); - vp.moveTo(vp.topLeft()-TnEngineVp.topLeft()); //make vp relative to TnEngineVp - QRect res = fromDocCoords(vp); //translate vp to mmap coords - // borders - res.moveTo(res.topLeft()+TnEngineRect().topLeft()); - // so that view area is within the indicator - res.adjust(1,1,-1,-1); - // ensure it is within the bounds - QRect mr = TnEngineRect(); - if (res.left() < mr.left()) { - res.setLeft(mr.left()); - } - if (res.top() < mr.top()) { - res.setTop(mr.top()); - } - if (res.right() > mr.right()) { - res.setRight(mr.right()); - } - if (res.bottom() > mr.bottom()) { - res.setBottom(mr.bottom()); - } - return res; -} - -void TnEngineHandler::documentStarted() -{ - scaledPageChanged(theRect(), true, false); - m_documentComplete = false; - m_viewportOnDocument = QRect(); - m_updateTimer->stop(); - m_updateCbTimer->stop(); - m_generator->clear(); - m_needsUpdate = false; - // keep bitmaps during loading to avoid constant realloc - m_generator->setKeepsBitmaps(true); -} - -void TnEngineHandler::documentChanged() -{ - long delay(m_documentComplete?KUpdateCbDelayComplete:KUpdateCbDelayLoading); - m_updateCbTimer->start( delay ); -} - -void TnEngineHandler::documentChangedCb() -{ - m_generator->invalidate(); - if (m_updateTimer->isActive()) { - // timer running, update when it completes - m_needsUpdate = true; - } - else { - if (documentSize().height()>5) { - m_viewportOnDocument = calcViewportOnDocument(); - m_generator->update(); - m_needsUpdate = false; - // don't do another update for.. - long delay(m_fullScreenMode?KUpdateDelayFullScreen:m_documentComplete?KUpdateDelayComplete:KUpdateDelayLoading); - m_updateTimer->start(delay); - } - } -} - -void TnEngineHandler::documentViewportMoved() -{ - m_viewportOnDocument = calcViewportOnDocument(); - m_generator->scroll(); - if (m_visible) { - m_generator->update(true); - } - else { - m_needsUpdate = true; - if (!m_updateTimer->isActive()) { - long delay(m_documentComplete?KUpdateDelayComplete:KUpdateDelayLoading); - m_updateTimer->start(delay); - } - } -} - -void TnEngineHandler::documentCompleted(bool) -{ - if( m_pageScalerUpdating ) return; - - // wait for a while so to make sure all images are decoded etc. - m_needsUpdate = true; - m_documentComplete = true; - m_updateTimer->start(0); - // we can delete the buffers now - m_generator->setKeepsBitmaps(false); - documentChanged(); -} - -QRect TnEngineHandler::viewportOnTnEngine() const -{ - return fromDocCoords(m_viewportOnDocument); -} - - -QRect TnEngineHandler::viewportOnDocument() const -{ - return m_viewportOnDocument; -} - -QSize TnEngineHandler::calcSize() const -{ - QSize res, max; - QSize mms = fromDocCoords(documentSize()); - max = m_containerRect.size(); - res.setWidth(qMin(mms.width(),max.width())); - res.setHeight(qMin(mms.height(),max.height())); - return res; -} - -QRect TnEngineHandler::calcViewportOnDocument() const -{ - QPoint mvp(m_viewportOnDocument.topLeft()); - - QRect docvp(documentViewport()); - QSize docs(documentSize()); - QSize ms(toDocCoords(TnEngineRect().size())); - QPoint docc(docvp.center()); - - if (!m_dragging) { - // scroll if not within 1/3 center area - // check x-direction - if (docc.x()<mvp.x()+ms.width()*KHScrollAreaPercent/100 || - docc.x()>mvp.x()+ms.width()*(100-KHScrollAreaPercent)/100) { - // far enough from the center, re-center the view - mvp.setX(docc.x()-ms.width()/2); - if (mvp.x()+ms.width()>docs.width()) { - mvp.setX(docs.width()-ms.width()); - } - if (mvp.x()<0) { - mvp.setX(0); - } - } - // y-direction - if (docc.y()<mvp.y()+ms.height()*KVScrollAreaPercent/100 || - docc.y()>mvp.y()+ms.height()*(100-KVScrollAreaPercent)/100) { - // far enough from the center, re-center the view - mvp.setY(docc.y()-ms.height()/2); - if (mvp.y()+ms.height()>docs.height()) { - mvp.setY(docs.height()-ms.height()); - } - if (mvp.y()<0) { - mvp.setY(0); - } - } - - } - else { - // check x-direction - bool moved = false; - if (docc.x()<mvp.x()+ms.width()*KHScrollAreaPercentWithTouch1/100) { - mvp.setX(docc.x()-ms.width()*KHScrollAreaPercentWithTouch2/100); - moved = true; - } - else if (docc.x()>mvp.x()+ms.width()*(100-KHScrollAreaPercentWithTouch1)/100) { - mvp.setX(docc.x()-ms.width()*(100-KHScrollAreaPercentWithTouch1)/100); - moved = true; - } - if (moved) { - if (mvp.x()+ms.width()>docs.width()) { - mvp.setX(docs.width()-ms.width()); - } - if (mvp.x()<0) { - mvp.setX(0); - } - } - // y-direction - moved = false; - if (docc.y()<mvp.y()+ms.height()*KVScrollAreaPercentWithTouch1/100) { - mvp.setY(docc.y()-ms.height()*KVScrollAreaPercentWithTouch2/80); - moved = true; - } - else if (docc.y()>mvp.y()+ms.height()*(100-KVScrollAreaPercentWithTouch1)/100) { - mvp.setY(docc.y()-ms.height()*(100-KVScrollAreaPercentWithTouch1)/100); - moved = true; - } - - if (moved) { - if (mvp.y()+ms.height()>docs.height()) { - mvp.setY(docs.height()-ms.height()); - } - if (mvp.y()<0) { - mvp.setY(0); - } - } - } - return QRect(mvp,ms); -} - -void TnEngineHandler::draw(QPainter& gc, const QRect& rect) const -{ - if (m_fullScreenMode) { - QPen pen(Qt::SolidLine); - pen.setColor(QColor(220,220,255)); - QBrush brush(Qt::SolidPattern); - brush.setColor(QColor(220,220,255)); - gc.setPen(pen); - gc.setBrush(brush); - gc.drawRect(m_containerRect); - m_generator->draw(gc, TnEngineRect()); - pen.setWidth(1); - pen.setColor(QColor(255, 0, 0)); - gc.setPen(pen); - gc.setBrush(Qt::NoBrush); - gc.drawRect(indicatorRect()); - } -} - -QRect TnEngineHandler::fromDocCoords(const QRect& from) const -{ - return QRect(fromDocCoords(from.topLeft()),fromDocCoords(from.size())); -} - -QPoint TnEngineHandler::fromDocCoords(const QPoint& from) const -{ - QPoint res; - res.setX(from.x()*100/m_zoomOutLevel); - res.setY(from.y()*100/m_zoomOutLevel); - return res; -} - -QSize TnEngineHandler::fromDocCoords(const QSize& from) const -{ - QSize res; - res.setWidth(from.width()*100/m_zoomOutLevel); - res.setHeight(from.height()*100/m_zoomOutLevel); - return res; -} - -QPoint TnEngineHandler::toDocCoords(const QPoint& from) const -{ - QPoint res; - res.setX(from.x()*m_zoomOutLevel/100); - res.setY(from.y()*m_zoomOutLevel/100); - return res; -} - -QSize TnEngineHandler::toDocCoords(const QSize& from) const -{ - QSize res; - res.setWidth(from.width()*m_zoomOutLevel/100); - res.setHeight(from.height()*m_zoomOutLevel/100); - return res; -} - -QRect TnEngineHandler::toDocCoords(const QRect& from) const -{ - return QRect(toDocCoords(from.topLeft()),toDocCoords(from.size())); -} - -bool TnEngineHandler::checkAndCreateBitmap(QSize sz, QPixmap*& image) -{ - if ( sz.width()<=0 || sz.height()<=0 ) { - // delete bitmap if there was one - delete image; - image = 0; - return false; - } - else { - if ( image && sz != image->size() ) { - // resize if different size - QPixmap* bm = new QPixmap(image->copy(0, 0, sz.width(), sz.height())); - delete image; - image = bm; - } - else if ( !image ) { - // create new - QPixmap* bm = new QPixmap(sz); - image = bm; - } - } - return true; -} - -void TnEngineHandler::updateCbTimerCb() -{ - m_updateCbTimer->stop(); - m_pageScalerUpdating = true; - documentChangedCb(); - m_pageScalerUpdating = false; -} - -void TnEngineHandler::updateTimerCb() -{ - m_updateTimer->stop(); - m_pageScalerUpdating = true; - if (m_needsUpdate) { - m_viewportOnDocument = calcViewportOnDocument(); - m_generator->update(); - } - m_needsUpdate = false; - m_pageScalerUpdating = false; - m_updateTimer->stop(); -} - -QRect TnEngineHandler::theRect() const -{ - return m_containerRect; -} - -void TnEngineHandler::setContainerRect(const QRect& rect) -{ - m_containerRect = rect; - m_viewportOnDocument = calcViewportOnDocument(); -} - -bool TnEngineHandler::isFullScreenMode() const -{ - return m_fullScreenMode; -} - -void TnEngineHandler::setFullScreenMode(bool fullScreenMode) -{ - m_fullScreenMode = fullScreenMode; - m_viewportOnDocument = calcViewportOnDocument(); -} - -void TnEngineHandler::setVisible(bool visible) -{ - if (visible && !m_visible) { - updateNow(); - } - m_visible = visible; -} - -void TnEngineHandler::updateNow() -{ - if (m_updateCbTimer->isActive()) { - m_updateCbTimer->stop(); - m_updateTimer->stop(); - documentChangedCb(); - } - else { - m_updateTimer->stop(); - updateTimerCb(); - } -} - -void TnEngineHandler::drawDocumentPart(QPainter& painter, const QRect& documentAreaToDraw) -{ - QWebFrame* frame = m_activePage->mainFrame(); - QRegion clip(documentAreaToDraw); - painter.save(); - painter.translate(-documentAreaToDraw.x(), -documentAreaToDraw.y()); - frame->render(&painter, clip); - painter.restore(); -} - -QRect TnEngineHandler::documentViewport() const -{ - QSize size = m_activePage->webWidget()->size().toSize(); - QSize offset = QSize(m_scrollX, m_scrollY); - return QRect(offset.width(), offset.height(), size.width(), size.height()); -} - -void TnEngineHandler::scaledPageChanged(const QRect& area, bool /*fullScreen*/, bool /*scroll*/) -{ - if (m_TnEngineView) - m_TnEngineView->update(area); -} - -QSize TnEngineHandler::documentSize() const -{ - return m_activePage->mainFrame()->contentsSize(); -} - -QWidget* TnEngineHandler::widget() -{ - return m_TnEngineView; -} - - -void TnEngineHandler::activate() -{ - if (!m_TnEngineView) { - createGenerator(); - createView(); - } -} - -void TnEngineHandler::deactivate() -{ - if (m_TnEngineView) { - destroyView(); - destroyGenerator(); - } -} - -void TnEngineHandler::createGenerator() -{ - Q_ASSERT(m_pageMgr); - m_activePage = m_pageMgr->currentPage(); - Q_ASSERT(m_activePage); - Q_ASSERT(!m_generator); - m_dragging = false; - QPoint pos(0,0); - pos = m_activePage->mainFrame()->scrollPosition(); - m_scrollX = pos.x(); - m_scrollY = pos.y(); - if (!m_generator) { - m_generator = TnEngineGenerator::initWithTnEngine(*this); - m_updateCbTimer = new QTimer(); - m_updateTimer = new QTimer(); - } -} - -void TnEngineHandler::destroyGenerator() -{ - Q_ASSERT(m_generator); - if (m_generator) { - delete m_generator; - m_generator = NULL; - } - if (m_updateCbTimer) { - m_updateCbTimer->stop(); - delete m_updateCbTimer; - m_updateCbTimer = NULL; - } - if (m_updateTimer) { - m_updateTimer->stop(); - delete m_updateTimer; - m_updateTimer = NULL; - } -} - -void TnEngineHandler::createView() -{ - Q_ASSERT(m_activePage); - connect(m_updateCbTimer, SIGNAL(timeout()), this, SLOT(updateCbTimerCb())); - connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateTimerCb())); - // connect(WebController::webController(), SIGNAL(activePageChanged()), this, SLOT(cancelTnEngineView())); - connect(m_activePage, SIGNAL(loadStarted()), this, SLOT(documentStarted())); - connect(m_activePage, SIGNAL(repaintRequested(const QRect&)), this, SLOT(documentChanged())); - connect(m_activePage, SIGNAL(loadFinished(bool)), this, SLOT(documentCompleted(bool))); - // connect(m_activePage, SIGNAL(scrollRequested(int, int, const QRect &)), this, SLOT(documentViewportMoved())); - Q_ASSERT(!m_TnEngineView); - - - - - //m_TnEngineView = TnEngineView::initiWithParentAndTnEngineHandler(m_activePage->webWidget(), this); - m_TnEngineView = TnEngineView::initiWithParentAndTnEngineHandler(m_parentWidget, this); - m_TnEngineView->show(); - m_savedPointPageView = documentViewport().topLeft(); - // connect(m_activePage, SIGNAL(scrollRequested(int, int, const QRect &)), m_TnEngineView, SLOT(update())); - connect(m_TnEngineView, SIGNAL(scrollBy(int, int)), this, SLOT(scrollBy(int, int))); - connect(m_TnEngineView, SIGNAL(scrollStarted()), this, SLOT(draggingStarted())); - connect(m_TnEngineView, SIGNAL(scrollEnded()), this, SLOT(draggingEnded())); - connect(m_TnEngineView, SIGNAL(ok()), this, SLOT(okInvoked())); - // get initial thumbnail - documentStarted(); - documentChanged(); - documentCompleted(true); -} - -void TnEngineHandler::destroyView() -{ - Q_ASSERT(m_activePage); - disconnect(m_updateCbTimer, SIGNAL(timeout()), this, SLOT(updateCbTimerCb())); - disconnect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateTimerCb())); - // disconnect(WebController::webController(), SIGNAL(activePageChanged()), this, SLOT(cancelTnEngineView())); - disconnect(m_activePage, SIGNAL(loadStarted()), this, SLOT(documentStarted())); - disconnect(m_activePage, SIGNAL(repaintRequested(const QRect&)), this, SLOT(documentChanged())); - disconnect(m_activePage, SIGNAL(loadFinished(bool)), this, SLOT(documentCompleted(bool))); - // disconnect(m_activePage, SIGNAL(scrollRequested(int, int, const QRect &)), this, SLOT(documentViewportMoved())); - Q_ASSERT(m_TnEngineView); - // disconnect(m_activePage, SIGNAL(scrollRequested(int, int, const QRect &)), m_TnEngineView, SLOT(update())); - disconnect(m_TnEngineView, SIGNAL(scrollBy(int, int)), this, SLOT(scrollBy(int, int))); - disconnect(m_TnEngineView, SIGNAL(scrollStarted()), this, SLOT(draggingStarted())); - disconnect(m_TnEngineView, SIGNAL(scrollEnded()), this, SLOT(draggingEnded())); - disconnect(m_TnEngineView, SIGNAL(ok()), this, SLOT(okInvoked())); - m_TnEngineView->hide(); - m_TnEngineView->deleteLater(); - m_TnEngineView = NULL; - m_visible = false; -} - -void TnEngineHandler::scrollBy(int x, int y) -{ - WebContentWidget* canvas = static_cast<WebContentWidget*>(m_activePage->webWidget()); - qreal w = documentSize().width() - canvas->size().width(); - qreal h = documentSize().height() - canvas->size().height(); - - qreal newX = m_scrollX + x; - qreal newY = m_scrollY + y; - newX = newX > 0 ? newX : 0; - newX = newX < w ? newX : w; - newY = newY > 0 ? newY : 0; - newY = newY < h ? newY : h; - m_scrollX = newX; - m_scrollY = newY; - if (m_generator) - documentViewportMoved(); - if (m_TnEngineView) - m_TnEngineView->update(); -} - -void TnEngineHandler::draggingStarted() -{ - m_dragging = true; -} - -void TnEngineHandler::draggingEnded() -{ - m_dragging = false; -} - -void TnEngineHandler::okInvoked() -{ - QPoint pos(0,0); - pos = m_activePage->mainFrame()->scrollPosition(); - - emit ok(m_scrollX - pos.x(), m_scrollY - pos.y()); -} - - -} -// End of File diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineHandler.h --- a/browsercore/appfw/ThumbnailEngine/TnEngineHandler.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,142 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __TNENGINEHANDLER_H__ -#define __TNENGINEHANDLER_H__ - -#include <QTimer> -#include <QPainter> - -namespace WRT { - - class TnEngineGenerator; - class TnEngineView; - class WrtBrowserContainer; - class WrtPageManager; - - class TnEngineHandler : public QObject - { - Q_OBJECT - public: - ~TnEngineHandler(); - TnEngineHandler(WrtPageManager * mgr, QWidget * parent); - - public: - void setVisible(bool visible); - bool isVisible() const { return m_visible; } - void setZoomOutLevel(int percent) { m_zoomOutLevel = percent; } - int zoomOutLevel() const { return m_zoomOutLevel; } - QRect theRect() const; - QRect indicatorRect() const; - TnEngineView* tnEngineView() { return m_TnEngineView; } - - void drawDocumentPart(QPainter& painter, const QRect& documentAreaToDraw); - QRect documentViewport() const; - void scaledPageChanged(const QRect& area, bool fullScreen, bool scroll); - QSize documentSize() const; - - public slots: - void documentStarted(); - void documentChanged(); - void documentCompleted(bool); - void documentViewportMoved(); - - public: - QRect TnEngineRect() const; - void draw(QPainter& gc, const QRect& rect) const; - QRect containerRect() const; - void setContainerRect(const QRect& rect); - bool isFullScreenMode() const; - void setFullScreenMode(bool fullScreenMode); - void updateNow(); - QRect viewportOnDocument() const; - - public slots: - - void updateCbTimerCb(); - void updateTimerCb(); - void scrollBy(int x, int y); - void draggingStarted(); - void draggingEnded(); - - signals: - void ok(int x, int y); - - private slots: - void okInvoked(); - - private: - friend class TnEngineGenerator; - - void createGenerator(); - void destroyGenerator(); - void createView(); - void destroyView(); - QRect fromDocCoords(const QRect& from) const; - QPoint fromDocCoords(const QPoint& from) const; - QSize fromDocCoords(const QSize& from) const; - QRect toDocCoords(const QRect& from) const; - QPoint toDocCoords(const QPoint& from) const; - QSize toDocCoords(const QSize& from) const; - bool checkAndCreateBitmap(QSize size, QPixmap*& image); - QSize calcSize() const; - QRect calcViewportOnDocument() const; - void documentChangedCb(); - void scrollTimerCb(); - void visibilityTimerCb(); - QRect viewportOnTnEngine() const; - - void activate(); - void deactivate(); - - public: - QWidget* widget(); - bool isDocumentComplete() const { return m_documentComplete; } - - private: - // Page Manager - WrtPageManager * m_pageMgr; - - - // generator - TnEngineGenerator* m_generator; - // zoom level of the TnEngine in percent - int m_zoomOutLevel; - QRect m_viewportOnDocument; - bool m_needsUpdate; - QTimer* m_updateTimer; - QTimer* m_updateCbTimer; - bool m_documentComplete; - QRect m_containerRect; - bool m_fullScreenMode; - bool m_visible; - bool m_pageScalerUpdating; - WrtBrowserContainer* m_activePage; - QPoint m_savedPointPageView; - TnEngineView* m_TnEngineView; - qreal m_scrollX; - qreal m_scrollY; - bool m_dragging; - - QWidget * m_parentWidget; - }; - -} -#endif - -// End of File diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineScaler.cpp --- a/browsercore/appfw/ThumbnailEngine/TnEngineScaler.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QTimer> -#include <QPainter> -#include "TnEngineScaler.h" - -namespace WRT { - -TnEngineScaler::TnEngineScaler(MTnEngineScalerCallback& callback) -: m_callback(&callback) -{ - m_resultBitmap = 0; -} - -void TnEngineScaler::init() -{ - m_scalingTimer = new QTimer(); - connect(m_scalingTimer, SIGNAL(timeout()), this, SLOT(run())); -} - -TnEngineScaler* TnEngineScaler::initWithCallback(MTnEngineScalerCallback& callback) -{ - TnEngineScaler* self = new TnEngineScaler(callback); - self->init(); - return self; -} - -TnEngineScaler::~TnEngineScaler() -{ - cancel(); - delete m_resultBitmap; - delete m_scalingTimer; -} - -void TnEngineScaler::startScaling(QPixmap& source, const QRect& targetRect) -{ - // cancel outstanding request - cancel(); - if (!m_resultBitmap || m_resultBitmap->size() != targetRect.size()) { - deleteResultBitmap(); - m_resultBitmap = new QPixmap(targetRect.size()); - } - *m_resultBitmap = source.scaled(targetRect.size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - m_targetRect = targetRect; - m_scalingTimer->start(20); -} - -void TnEngineScaler::deleteResultBitmap() -{ - delete m_resultBitmap; - m_resultBitmap = 0; -} - -void TnEngineScaler::cancel() -{ - m_scalingTimer->stop(); - deleteResultBitmap(); -} - -void TnEngineScaler::run() -{ - m_scalingTimer->stop(); - m_callback->scalingCompleted(*m_resultBitmap, m_targetRect); - // if the callback called StartScalingL(), we must not delete the bitmap - if (!isActive()) { - deleteResultBitmap(); - } -} - -bool TnEngineScaler::isActive() -{ - return m_scalingTimer->isActive(); -} - -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineScaler.h --- a/browsercore/appfw/ThumbnailEngine/TnEngineScaler.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __TNENGINESCALER_H__ -#define __TNENGINESCALER_H__ - - -#include <QObject> -#include <QPixmap> - -namespace WRT { - -class MTnEngineScalerCallback : public QObject -{ -public: - virtual void scalingCompleted(QPixmap& result, const QRect& targetRect) = 0; -}; - - -class TnEngineScaler : public QObject -{ -Q_OBJECT -public: - static TnEngineScaler* initWithCallback(MTnEngineScalerCallback& callback); - virtual ~TnEngineScaler(); - -public: // New functions - void startScaling(QPixmap& source, const QRect& targetRect); - bool isActive(); - -public slots: - void run(); - -public: - void cancel(); - -private: - TnEngineScaler(MTnEngineScalerCallback& callback); - void init(); - void deleteResultBitmap(); - -private: // Data - MTnEngineScalerCallback* m_callback; - QPixmap* m_resultBitmap; - QRect m_targetRect; - QTimer* m_scalingTimer; -}; - -} -#endif // __TNENGINESCALER_H__ - -// End of File diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineView.cpp --- a/browsercore/appfw/ThumbnailEngine/TnEngineView.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QPainter> -#include <QPaintEvent> -#include "TnEngineView.h" -#include "TnEngineHandler.h" - -const int ScrollingDelta = 60; - -namespace WRT { - -TnEngineView::TnEngineView(QWidget* parent, TnEngineHandler* handler) -: QWidget(parent), m_TnEngineHandler(handler) -{ - //connect(this, SIGNAL(closeViewRequested()), WebController::webController()->wrtController(), SLOT(closeViewRequested())); - //connect(this, SIGNAL(cancelViewRequested()), WebController::webController()->wrtController(), SLOT(cancelViewRequested())); -} - -void TnEngineView::initview() -{ - setGeometry(parentWidget()->rect()); - m_TnEngineHandler->setFullScreenMode(true); - m_TnEngineHandler->setContainerRect(QRect(QPoint(0, 0), rect().size())); - m_TnEngineHandler->setVisible(true); - // ensure that system cursor is an arrow, not a random icon. - // This is not an issue if the platform does not have a system cursor - - // FIXME: Cursor undef for symbian? -#if !defined(Q_OS_SYMBIAN) - setCursor(Qt::ArrowCursor); -#endif - setFocusPolicy(Qt::WheelFocus); - setFocus(Qt::OtherFocusReason); -} - - -TnEngineView* TnEngineView::initiWithParentAndTnEngineHandler(QWidget* parent, TnEngineHandler* handler) -{ - TnEngineView* that = new TnEngineView(parent, handler); - that->initview(); - return that; -} - -TnEngineView::~TnEngineView() -{ - //m_TnEngineHandler->setVisible(false); - //m_TnEngineHandler->setFullScreenMode(false); -} - -void TnEngineView::paintEvent(QPaintEvent* e) -{ - TnEngineView* that = const_cast<TnEngineView*>(this); - QPainter painter(that); - m_TnEngineHandler->setVisible(true); - m_TnEngineHandler->draw(painter, e->rect()); -} - -void TnEngineView::keyPressEvent(QKeyEvent* ev) -{ - if ( ev->key() == Qt::Key_Enter - || ev->key() == Qt::Key_Return - || ev->key() == Qt::Key_Select ) { - emit ok(); - return; - } - if (ev->key() == Qt::Key_Escape) { - emit cancel(); - return; - } - if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down || ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right) { - int x = ScrollingDelta / 2, y = ScrollingDelta; - switch (ev->key()) { - case Qt::Key_Down: - x = 0; - break; - case Qt::Key_Up: - x = 0; - y *= -1; - break; - case Qt::Key_Left: - x *= -1; - y = 0; - break; - case Qt::Key_Right: - y = 0; - break; - } - emit scrollBy(x, y); - } -} - -void TnEngineView::resizeEvent(QResizeEvent* event) -{ - m_TnEngineHandler->setContainerRect(QRect(QPoint(0, 0), rect().size())); -} - -void TnEngineView::mouseMoveEvent(QMouseEvent* e) -{ - QRect indicatorRect = m_TnEngineHandler->indicatorRect(); - int zoomLevel = m_TnEngineHandler->zoomOutLevel(); - int xDelta = ((e->x() - indicatorRect.x() - indicatorRect.width() / 2) * zoomLevel ) / 100; - int yDelta = ((e->y() - indicatorRect.y() - indicatorRect.height() / 2) * zoomLevel ) / 100; - emit scrollBy(xDelta, yDelta); - m_currPoint.setX(e->x()); - m_currPoint.setY(e->y()); -} - -void TnEngineView::mousePressEvent(QMouseEvent* e) -{ - m_currPoint.setX(e->x()); - m_currPoint.setY(e->y()); -} - -void TnEngineView::mouseReleaseEvent(QMouseEvent* e) -{ - m_currPoint.setX(e->x()); - m_currPoint.setY(e->y()); - emit ok(); -} - -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/ThumbnailEngine/TnEngineView.h --- a/browsercore/appfw/ThumbnailEngine/TnEngineView.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __TNENGINEVIEW_H__ -#define __TNENGINEVIEW_H__ - -#include <QWidget> - -namespace WRT { - -class TnEngineHandler; - -class TnEngineView : public QWidget - { - Q_OBJECT - - public: - static TnEngineView* initiWithParentAndTnEngineHandler(QWidget* parent, TnEngineHandler* handler); - virtual ~TnEngineView(); - - protected: - virtual void paintEvent(QPaintEvent* e); - virtual void keyPressEvent(QKeyEvent* ev); - virtual void resizeEvent (QResizeEvent* event); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - - signals: - void scrollStarted(); - void scrollBy(int x, int y); - void scrollEnded(); - void ok(); - void cancel(); - - private: - TnEngineView(QWidget* parent, TnEngineHandler* handler); - void initview(); - - private: // Data - TnEngineHandler* m_TnEngineHandler; - QPoint m_currPoint; - }; -} -#endif // __TNENGINEVIEW_H__ - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/appfw-includepath.pri --- a/browsercore/appfw/appfw-includepath.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/appfw-includepath.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # INCLUDEPATH += \ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/appfw/appfw.pri --- a/browsercore/appfw/appfw.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/appfw/appfw.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # include($$PWD/Common/Common.pri) diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/browsercore.pro --- a/browsercore/browsercore.pro Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/browsercore.pro Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # TEMPLATE = subdirs diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/WebNetworkConnectionManagerSingleton.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/core/WebNetworkConnectionManagerSingleton.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef WEBNETWORKCONNECTIONMANAGERSINGLETON_H_ +#define WEBNETWORKCONNECTIONMANAGERSINGLETON_H_ +#include "singleton.h" +#include "network/WebNetworkConnectionManager.h" + +namespace WRT { + +// Define the Meyer's singleton for WebNetworkConnectionManager +typedef Singleton<WebNetworkConnectionManager> WebNetworkConnectionManagerSingleton; + +} +#endif /* WEBNETWORKCONNECTIONMANAGER_H_ */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/WrtTelService.rss --- a/browsercore/core/WrtTelService.rss Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/WrtTelService.rss Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - NAME WTEL #include <eikon.rh> diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/ZoomMetaData.h --- a/browsercore/core/ZoomMetaData.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/ZoomMetaData.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,24 +1,32 @@ /* * Copyright (c) 2010 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 __ZOOMMETADATA_H__ #define __ZOOMMETADATA_H__ +#ifdef BEDROCK_TILED_BACKING_STORE +#include <QRectF> +#include <QString> +#endif + // To store the view port proeperties that affect zoom set through meta data. // This is available in the main frame of the page but to avoid parsing the meta // data again, store it @@ -36,6 +44,14 @@ qreal minScale; qreal maxScale; bool userScalable; - +#ifdef BEDROCK_TILED_BACKING_STORE + qreal initialScale; + QRectF rect; + QRectF webViewSize; + qreal scale; + QSizeF viewportSize; + QString m_specifiedWidth; + QString m_specifiedHeight; +#endif }; #endif //__ZOOMMETADATA_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/actionjsobject.cpp --- a/browsercore/core/actionjsobject.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/actionjsobject.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "actionjsobject.h" #include <QDebug> diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/actionjsobject.h --- a/browsercore/core/actionjsobject.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/actionjsobject.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 _ACTIONJSOBJECT_H_INCLUDED #define _ACTIONJSOBJECT_H_INCLUDED diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/browserpagefactory.h --- a/browsercore/core/browserpagefactory.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/browserpagefactory.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 __BROWSERPAGEFACTORY_H__ #define __BROWSERPAGEFACTORY_H__ @@ -23,11 +26,16 @@ class QWebPage; +namespace WRT { + class WrtBrowserContainer; +} +using namespace WRT; + struct BWF_EXPORT BrowserPageFactory { - virtual QWebPage* openPage() = 0; + virtual WRT::WrtBrowserContainer* openPage() = 0; - static QWebPage* openBrowserPage(); + static WRT::WrtBrowserContainer* openBrowserPage(); bool m_bRestoreSession; }; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/brtglobal.h --- a/browsercore/core/brtglobal.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/brtglobal.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __BRTGLOBAL_H_ #define __BRTGLOBAL_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/core.pri --- a/browsercore/core/core.pri Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/core.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # HEADERS += \ @@ -19,38 +23,30 @@ $$PWD/network/webcookiejar.h \ $$PWD/network/webnetworkaccessmanager.h \ $$PWD/network/SchemeHandlerBr.h \ +# $$PWD/network/networkdiskcache.h \ +# $$PWD/network/networkdiskcache_p.h \ $$PWD/actionjsobject.h \ $$PWD/browserpagefactory.h \ $$PWD/brtglobal.h \ $$PWD/scriptobjects.h \ $$PWD/webpagedata.h \ $$PWD/wrtbrowsercontainer_p.h \ - $$PWD/wrtbrowsercontainer.h \ - $$PWD/webcursornavigation.h \ - $$PWD/webdirectionalnavigation.h \ - $$PWD/webhtmltabbednavigation.h \ - $$PWD/webnavigation.h \ - $$PWD/webtouchnavigation.h \ - $$PWD/wrtpage.h + $$PWD/wrtbrowsercontainer.h SOURCES += \ $$PWD/network/networkerrorreply.cpp \ $$PWD/network/webcookiejar.cpp \ $$PWD/network/webnetworkaccessmanager.cpp \ $$PWD/network/SchemeHandlerBr.cpp \ +# $$PWD/network/networkdiskcache.cpp \ $$PWD/actionjsobject.cpp \ - $$PWD/wrtbrowsercontainer.cpp \ - $$PWD/webcursornavigation.cpp \ - $$PWD/webdirectionalnavigation.cpp \ - $$PWD/webhtmltabbednavigation.cpp \ - $$PWD/webnavigation.cpp \ - $$PWD/webtouchnavigation.cpp \ - $$PWD/wrtpage.cpp + $$PWD/wrtbrowsercontainer.cpp -contains(what, plat_101 ) { +contains(br_mobility_bearer, yes) { HEADERS += \ $$PWD/network/WebNetworkConnectionManager.h \ - $$PWD/network/WebNetworkSession.h + $$PWD/network/WebNetworkSession.h \ + $$PWD/singleton.h SOURCES += \ $$PWD/network/WebNetworkConnectionManager.cpp \ $$PWD/network/WebNetworkSession.cpp \ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/core.pro --- a/browsercore/core/core.pro Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/core.pro Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # @@ -30,8 +34,15 @@ ROOT_DIR = $$PWD/../.. QT += webkit +include($$ROOT_DIR/flags.pri) include($$ROOT_DIR/browserui.pri) +contains(DEFINES, ENABLE_PERF_TRACE) { +message("core.pro: Tracing is ON") +LIBS += -lbrperftrace +INCLUDEPATH += $$ROOT_DIR/internal/tests/perfTracing +} + isEmpty(WRT_OUTPUT_DIR) { symbian { CONFIG(release, debug|release):WRT_OUTPUT_DIR=$$PWD/../../WrtBuild/Release @@ -56,7 +67,7 @@ } #LIBS += -llibpthread -letel -lsysutil -lWrtTelService -lsendui -letext -lcommonengine -lcone -lefsrv LIBS += -llibpthread -letel -lsysutil -lsendui -letext -lcommonengine -lcommonui -lcone -lefsrv -lServiceHandler -lapmime -lapparc - + isEmpty(SYMBIAN_PUB_SDK) { LIBS += \ -laiwdialdata @@ -67,10 +78,11 @@ "HEADER" \ "TARGETPATH resource/apps" \ "END" + MMP_RULES += AIWResource - browsercorelibs.sources = browsercore.dll + browsercorelibs.sources = BrowserCore.dll browsercorelibs.path = /sys/bin @@ -88,8 +100,12 @@ building-libs \ depend_includepath \ dll + +contains(br_mobility_sysinfo, yes) { + DEFINES += QT_MOBILITY_SYSINFO +} -contains(what, plat_101 ) { +contains(br_mobility_bearer, yes) { CONFIG += mobility MOBILITY = bearer DEFINES += QT_MOBILITY_BEARER_MANAGEMENT @@ -111,6 +127,11 @@ unix : contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions } +contains(br_tiled_backing_store, yes) { + DEFINES += BEDROCK_TILED_BACKING_STORE +} + + CONFIG -= warn_on *-g++* : QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing @@ -136,11 +157,21 @@ TARGET.CAPABILITY = All -TCB -DRM -AllFiles TARGET.UID3 = 0x200267BB TARGET.VID = VID_DEFAULT + MMP_RULES += EXPORTUNFROZEN } # Import pre-built binary components. -include($$PWD/../../../../../import/import.pri) +symbian: { + contains (br_download_mgr, yes) { + DEFINES += USE_DOWNLOAD_MANAGER=1 + INCLUDEPATH += /epoc32/include/applications + LIBS += -lBrServiceIPCClient + LIBS += -lBrDownloadMgr + } +} else { + include($$PWD/../../../../../import/import.pri) +} # @@ -151,7 +182,7 @@ include($$PWD/../appfw/appfw-includepath.pri) # TEMP until appfw is its own dll -DEFINES += BUILDING_BWF_CORE +# DEFINES += BUILDING_BWF_CORE include(../appfw/appfw.pri) QT += network diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/SchemeHandlerBr.cpp --- a/browsercore/core/network/SchemeHandlerBr.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/SchemeHandlerBr.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,24 +1,28 @@ /* * 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: * */ - // INCLUDE FILES #include <QUrl> #include <QDesktopServices> +#include <QStringList> #if defined(Q_OS_SYMBIAN) #include "WrtTelServiceBr.h" @@ -31,7 +35,6 @@ #include <apparc.h> #endif #include "SchemeHandlerBr.h" -//#include "wrtsettings.h" #include "bedrockprovisioning.h" #define MAILTO_SCHEME "mailto" diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/SchemeHandlerBr.h --- a/browsercore/core/network/SchemeHandlerBr.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/SchemeHandlerBr.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 SCHEME_HANDLER_H #define SCHEME_HANDLER_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WebNetworkConnectionManager.cpp --- a/browsercore/core/network/WebNetworkConnectionManager.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WebNetworkConnectionManager.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,53 +1,85 @@ /* * Copyright (c) 2010 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: * */ - - #include "WebNetworkConnectionManager.h" +#include "WebNetworkSession.h" namespace WRT { +/*! + Constructs a WebNetworkConfigurationManager with the given \a parent. +*/ WebNetworkConnectionManager::WebNetworkConnectionManager(QObject *parent) - : QObject(parent), m_WebNetworkSession(0) + : QObject(parent), m_WebNetworkSession(0), m_offlined(false) { + // set up handlers for Network Configuration Manager signals connect(&m_NetworkConfigurationManager, SIGNAL(updateCompleted()), - this, SLOT(configurationUpdateCompleted())); + this, SLOT(handleConfigurationUpdateCompleted())); connect(&m_NetworkConfigurationManager, SIGNAL(configurationAdded(const QNetworkConfiguration&)), - this, SLOT(configurationAdded(const QNetworkConfiguration&))); + this, SLOT(handleConfigurationAdded(const QNetworkConfiguration&))); connect(&m_NetworkConfigurationManager, SIGNAL(configurationRemoved(const QNetworkConfiguration&)), - this, SLOT(configurationRemoved(const QNetworkConfiguration&))); + this, SLOT(handleConfigurationRemoved(const QNetworkConfiguration&))); connect(&m_NetworkConfigurationManager, SIGNAL(onlineStateChanged(bool)), - this, SLOT(onlineStateChanged(bool))); + this, SLOT(handleOnlineStateChanged(bool))); connect(&m_NetworkConfigurationManager, SIGNAL(configurationChanged(const QNetworkConfiguration&)), - this, SLOT(configurationChanged(const QNetworkConfiguration&))); - - updateConfigurations(); + this, SLOT(handleConfigurationChanged(const QNetworkConfiguration&))); + +#ifdef QT_MOBILITY_SYSINFO + // initialize the mapping between network mode string and SystemNetworkInfo::NetworkMode + initializeMapString(); +#endif // QT_MOBILITY_SYSINFO } +/*! + Frees the resources associated with the WebNetworkConfigurationManager object. +*/ WebNetworkConnectionManager::~WebNetworkConnectionManager() { if (m_WebNetworkSession) deleteSession(); } +/*! + Initiates an update of all configurations. This may be used to initiate WLAN scans or other + time consuming updates which may be required to obtain the correct state for configurations. + + This call is asynchronous. On completion of this update the updateCompleted() signal is + emitted. If new configurations are discovered or old ones were removed or changed the update + process may trigger the emission of one or multiple configurationAdded(), + configurationRemoved() and configurationChanged() signals. + + If a configuration state changes as a result of this update all existing QNetworkConfiguration + instances are updated automatically. +*/ void WebNetworkConnectionManager::updateConfigurations() { m_NetworkConfigurationManager.updateConfigurations(); } +/*! + Returns the default configuration to be used. This function always returns a discovered + configuration; otherwise an invalid configuration. Only configuration type SNAP is handled. + + In some cases it may be required to call updateConfigurations() and wait for the + updateCompleted() signal before calling this function. +*/ QNetworkConfiguration WebNetworkConnectionManager::defaultConfiguration() const { const bool canStartIAP = (m_NetworkConfigurationManager.capabilities() @@ -74,17 +106,35 @@ return config; } +/*! + Create a Web Network Session using a QNetworkConfiguration and connect to its signals. + +*/ void WebNetworkConnectionManager::createSession(QNetworkConfiguration config) { m_WebNetworkSession = new WebNetworkSession(config); + + // set up handlers for the WebNetworkSession signals + connect(m_WebNetworkSession, SIGNAL(sessionConfigurationChanged(const QNetworkConfiguration &)), + this, SLOT(handleSessionConfigurationChanged(const QNetworkConfiguration &))); } +/*! + Delete a Web Network Session. + +*/ void WebNetworkConnectionManager::deleteSession(void) { delete m_WebNetworkSession; + m_WebNetworkSession = 0; } -void WebNetworkConnectionManager::configurationUpdateCompleted() +/*! + Handle the updateCompleted signal from Network Configuration Manager. + + It creates a Web Network Session using the default configuration. +*/ +void WebNetworkConnectionManager::handleConfigurationUpdateCompleted() { qDebug() << "configurationUpdateCompleted: create new network connection session"; if (m_WebNetworkSession) @@ -96,31 +146,122 @@ createSession(defaultConfiguration()); } -void WebNetworkConnectionManager::configurationAdded(const QNetworkConfiguration& config) +/*! + Handle the configurationAdded signal from Network Configuration Manager. +*/ +void WebNetworkConnectionManager::handleConfigurationAdded(const QNetworkConfiguration& config) { qDebug() << "Configuration" << config.name() << "Added"; } -void WebNetworkConnectionManager::configurationRemoved(const QNetworkConfiguration& config) +/*! + Handle the configurationRemoved signal from Network Configuration Manager +*/ +void WebNetworkConnectionManager::handleConfigurationRemoved(const QNetworkConfiguration& config) { qDebug() << "Configuration" << config.name() << "Removed"; } -void WebNetworkConnectionManager::onlineStateChanged(bool isOnline) +/*! + Handle the onlineStateChanged signal from Network Configuration Manager. +*/ +void WebNetworkConnectionManager::handleOnlineStateChanged(bool isOnline) { + emit networkOnlineStateChanged(isOnline); + if (!isOnline) { qDebug() << "offline"; + m_offlined = true; } else { qDebug() << "online"; + m_offlined = false; } // flash icon to indicate the online state change with "online" and "offline". } -void WebNetworkConnectionManager::configurationChanged(const QNetworkConfiguration &config) +/*! + Handle the configurationChanged signal from Network Configuration Manager. +*/ +void WebNetworkConnectionManager::handleConfigurationChanged(const QNetworkConfiguration &config) { - qDebug() << "Configuration" << config.name() << "Changed"; + qDebug() << "Configuration" << config.name() << "Changed"; + qDebug() << "bearername:" << config.bearerName() << "type:" << config.type() << "state:" << config.state() << "purpose:" << config.purpose(); + + /* The QNetworkSession is closed becuase of previous offline condition. Re-open the session if + the configuration matches the configurations hold by the QNetworkSession */ +#ifdef NO_OFFLINED_BUG + if (isOfflined()) + { +#endif // NO_OFFLINED_BUG + if (m_WebNetworkSession && !m_WebNetworkSession->isOpen()) + { + QNetworkConfiguration sessionConfig = m_WebNetworkSession->configuration(); + QList<QNetworkConfiguration> children = sessionConfig.children(); + switch(sessionConfig.type()) + { + case QNetworkConfiguration::ServiceNetwork: + /* Traverse all configuration to find the matching configuration */ + foreach(QNetworkConfiguration tmpConfig, children) + { + if (config == tmpConfig) + { + if ((config.state() == QNetworkConfiguration::Discovered) || + (config.state() == QNetworkConfiguration::Active)) + m_WebNetworkSession->open(); + break; + } + } + break; + case QNetworkConfiguration::InternetAccessPoint: + qDebug() << "InternetAccessPoint"; + break; + case QNetworkConfiguration::UserChoice: + qDebug() << "UserChoice"; + break; + default: + break; + } + } +#ifdef NO_OFFLINED_BUG + } +#endif // NO_OFFLINED_BUG +} + +/*! + Handle the networkNameChanged signal from Network Configuration Manager and translate + sessionConfiguration signal to networknameChanged. + + It a\ emits networkNameChanged signal for no cellular network connetion. +*/ +void WebNetworkConnectionManager::handleSessionConfigurationChanged(const QNetworkConfiguration &config) +{ + qDebug() << "handleSessionConfigurationChanged" << "bearername:" << config.bearerName(); + +#ifdef QT_MOBILITY_SYSINFO + QSystemNetworkInfo::NetworkMode mode; + mode = m_mapStringNetworkMode[config.bearerName()]; + + emit networkSessionNameChanged(mode, config.name()); +#endif // QT_MOBILITY_SYSINFO } + +#ifdef QT_MOBILITY_SYSINFO +void WebNetworkConnectionManager::initializeMapString(void) +{ + m_mapStringNetworkMode["Ethernet"] = QSystemNetworkInfo::EthernetMode; + m_mapStringNetworkMode["WLAN"] = QSystemNetworkInfo::WlanMode; + m_mapStringNetworkMode["2G"] = QSystemNetworkInfo::GsmMode; + m_mapStringNetworkMode["CDMA2000"] = QSystemNetworkInfo::CdmaMode; + m_mapStringNetworkMode["WCDMA"] = QSystemNetworkInfo::WcdmaMode; + m_mapStringNetworkMode["HSPA"] = QSystemNetworkInfo::UnknownMode; + m_mapStringNetworkMode["Bluetooth"] = QSystemNetworkInfo::BluetoothMode; + m_mapStringNetworkMode["WiMAX"] = QSystemNetworkInfo::WimaxMode; + m_mapStringNetworkMode[""] = QSystemNetworkInfo::UnknownMode; } +#endif // QT_MOBILITY_SYSINFO + +} // WRT + diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WebNetworkConnectionManager.h --- a/browsercore/core/network/WebNetworkConnectionManager.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WebNetworkConnectionManager.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,55 +1,78 @@ /* * Copyright (c) 2010 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 WEBNETWORKCONNECTIONMANAGER_H_ #define WEBNETWORKCONNECTIONMANAGER_H_ - +#include "brtglobal.h" #include <qnetworkconfigmanager.h> #include <qnetworksession.h> -#include "WebNetworkSession.h" +#ifdef QT_MOBILITY_SYSINFO +#include <qsysteminfo.h> +#endif // QT_MOBILITY_SYSINFO QTM_USE_NAMESPACE namespace WRT { + +class WebNetworkSession; -class WebNetworkConnectionManager : public QObject +class WRT_BROWSER_EXPORT WebNetworkConnectionManager : public QObject { Q_OBJECT public: WebNetworkConnectionManager(QObject *parent = 0); virtual ~WebNetworkConnectionManager(); + void updateConfigurations(); QNetworkConfiguration defaultConfiguration() const; void createSession(QNetworkConfiguration config); void deleteSession(); - -private Q_SLOTS: - void configurationUpdateCompleted(); - void configurationAdded(const QNetworkConfiguration& config); - void configurationRemoved(const QNetworkConfiguration& config); - void onlineStateChanged(bool isOnline); - void configurationChanged(const QNetworkConfiguration& config); + bool isOfflined() const { return m_offlined; } + +#ifdef QT_MOBILITY_SYSINFO +Q_SIGNALS: + void networkOnlineStateChanged(bool isOnline); + void networkSessionNameChanged(QSystemNetworkInfo::NetworkMode mode, const QString &netName); +#endif // QT_MOBILITY_SYSINFO + +protected Q_SLOTS: + virtual void handleConfigurationUpdateCompleted(); + virtual void handleConfigurationAdded(const QNetworkConfiguration& config); + virtual void handleConfigurationRemoved(const QNetworkConfiguration& config); + virtual void handleOnlineStateChanged(bool isOnline); + virtual void handleConfigurationChanged(const QNetworkConfiguration& config); + virtual void handleSessionConfigurationChanged(const QNetworkConfiguration &config); private: +#ifdef QT_MOBILITY_SYSINFO + void initializeMapString(void); + + QMap<QString, QSystemNetworkInfo::NetworkMode> m_mapStringNetworkMode; +#endif // QT_MOBILITY_SYSINFO + QNetworkConfigurationManager m_NetworkConfigurationManager; WebNetworkSession *m_WebNetworkSession; + bool m_offlined; }; -} +} // namesspace WRT #endif /* WEBNETWORKCONNECTIONMANAGER_H_ */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WebNetworkSession.cpp --- a/browsercore/core/network/WebNetworkSession.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WebNetworkSession.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,41 +1,55 @@ /* * Copyright (c) 2010 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: * */ - #include "WebNetworkSession.h" +namespace WRT { + +/*! + Constructs a Web Network Session based on \a QNetworkConfiguration with the given \a parent. + + \sa QNetworkConfiguration +*/ WebNetworkSession::WebNetworkSession(const QNetworkConfiguration &config, QObject *parent) : QObject(parent) { m_NetworkSession = new QNetworkSession(config); - m_NetworkSession->open(); - + // set up the handlers for QNetworkSession signals connect(m_NetworkSession, SIGNAL(preferredConfigurationChanged(const QNetworkConfiguration&, bool)), - this, SLOT(preferredConfigurationChanged(const QNetworkConfiguration&, bool))); - connect(m_NetworkSession, SIGNAL(newConfigurationActivated()), this, SLOT(newConfigurationActivated())); + this, SLOT(handlePreferredConfigurationChanged(const QNetworkConfiguration&, bool))); + connect(m_NetworkSession, SIGNAL(newConfigurationActivated()), this, SLOT(handleNewConfigurationActivated())); connect(m_NetworkSession, SIGNAL(stateChanged(QNetworkSession::State)), - this, SLOT(stateChanged(QNetworkSession::State))); - connect(m_NetworkSession, SIGNAL(opened()), this, SLOT(opened())); - connect(m_NetworkSession, SIGNAL(closed()), this, SLOT(closed())); + this, SLOT(handleStateChanged(QNetworkSession::State))); + connect(m_NetworkSession, SIGNAL(opened()), this, SLOT(handleOpened())); + connect(m_NetworkSession, SIGNAL(closed()), this, SLOT(handleClosed())); connect(m_NetworkSession, SIGNAL(error(QNetworkSession::SessionError)), - this, SLOT(error(QNetworkSession::SessionError))); + this, SLOT(handleError(QNetworkSession::SessionError))); + + m_NetworkSession->open(); } +/*! + Frees the resources associated with the WebNetworkSession object. +*/ WebNetworkSession::~WebNetworkSession() { // Close the network connection session before delete. @@ -43,14 +57,20 @@ delete m_NetworkSession; } -void WebNetworkSession::preferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless) +/*! + Handle the preferredConfigurationChanged signal from Network Session. + + It emits networkNameChnaged signal if it migrates to the new QNetworkConfiguration. +*/ +void WebNetworkSession::handlePreferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless) { bool isSelected = TRUE; if (isSeamless) { m_NetworkSession->migrate(); - qDebug() << "Migrate to new Network Connection: " << config.name(); + qDebug() << "Migrate to new Network Connection: " << config.name(); + emit sessionConfigurationChanged(config); } else { @@ -58,7 +78,8 @@ if (isSelected) { m_NetworkSession->migrate(); - qDebug() << "Migrate to new Network Connection: " << config.name(); + qDebug() << "Migrate to new Network Connection: " << config.name(); + emit sessionConfigurationChanged(config); } else { @@ -68,7 +89,13 @@ } } -void WebNetworkSession::newConfigurationActivated() +/*! + Handle the newConfigurationActivated from Network Session. + + It emits networknameChanged signal with current QNetworkConfiguration. + +*/ +void WebNetworkSession::handleNewConfigurationActivated() { bool isConnected = TRUE; @@ -85,9 +112,21 @@ // flash the old connection network qDebug() << "Reject new Network Connection"; } + + emit sessionConfigurationChanged(activeConfiguration()); } -void WebNetworkSession::stateChanged(QNetworkSession::State state) +/*! + Handle the stateChanged signal from Network Session. If the session is based on a single + access point configuration, the state of the session is the same state of the associated + network interface. A QNetworkConfiguration::ServiceNetwork based session summarizes the + state of all its children and therefore returns the Connected state if at least one of its + sub configurations is connected. + + It emits networkSignalStrengthChanged signal with current QNetworkConfiguraiton + and QNetworkSession::State. +*/ +void WebNetworkSession::handleStateChanged(QNetworkSession::State state) { switch (state) { case QNetworkSession::Invalid: @@ -113,20 +152,34 @@ break; default: qDebug() << "Unknown"; - } + } + emit sessionStateChanged(m_NetworkSession->configuration(), state); } -void WebNetworkSession::opened() -{ +/*! + Handle the opened signal from Network Session. + + It emits networkNameChanged signal with activeConfiguration. +*/ +void WebNetworkSession::handleOpened() +{ qDebug() << "Session Opened"; + + emit sessionConfigurationChanged(activeConfiguration()); } -void WebNetworkSession::closed() +/*! + Handle the closed signal from Network Session. +*/ +void WebNetworkSession::handleClosed() { qDebug() << "Session Closed"; } -void WebNetworkSession::error(QNetworkSession::SessionError error) +/*! + Handle the error signal from Network Session. +*/ +void WebNetworkSession::handleError(QNetworkSession::SessionError error) { switch (error) { @@ -149,3 +202,44 @@ qDebug() << "Unknown Error"; } } + +QNetworkConfiguration WebNetworkSession::activeConfiguration(void) +{ + QString activeIdentifier = m_NetworkSession->sessionProperty("ActiveConfiguration").toString(); + QNetworkConfiguration config = m_NetworkSession->configuration(); + QNetworkConfiguration activeConfig; + QList<QNetworkConfiguration> children; + + qDebug() << activeIdentifier; + + switch(config.type()) + { + case QNetworkConfiguration::ServiceNetwork: + qDebug() << "ServiceNetwork"; + children = config.children(); + /* Traverse all configuration to find the active configuration */ + foreach(QNetworkConfiguration tmpConfig, children) + { + qDebug() << tmpConfig.identifier(); + if (activeIdentifier == tmpConfig.identifier()) + { + activeConfig = tmpConfig; + break; + } + } + break; + case QNetworkConfiguration::InternetAccessPoint: + qDebug() << "InternetAccessPoint"; + activeConfig = config; + break; + case QNetworkConfiguration::UserChoice: + qDebug() << "UserChoice"; + break; + default: + break; + } + + return activeConfig; +} + +} // namespace WRT \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WebNetworkSession.h --- a/browsercore/core/network/WebNetworkSession.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WebNetworkSession.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,45 +1,63 @@ /* * Copyright (c) 2010 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 WEBNETWORKSESSION_H_ #define WEBNETWORKSESSION_H_ +#include "brtglobal.h" #include <qnetworksession.h> QTM_USE_NAMESPACE -class WebNetworkSession : public QObject +namespace WRT { + +class WRT_BROWSER_EXPORT WebNetworkSession : public QObject { Q_OBJECT public: WebNetworkSession(const QNetworkConfiguration &config, QObject *parent = 0); virtual ~WebNetworkSession(); + QNetworkConfiguration configuration() const { return m_NetworkSession->configuration(); } + bool isOpen() const { return m_NetworkSession->isOpen(); } + void open() { m_NetworkSession->open(); } + +Q_SIGNALS: + void sessionConfigurationChanged(const QNetworkConfiguration &config); + void sessionStateChanged(const QNetworkConfiguration &config, + QNetworkSession::State state); -private Q_SLOTS: - void preferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless); - void newConfigurationActivated(); - void stateChanged(QNetworkSession::State state); - void opened(); - void closed(); - void error(QNetworkSession::SessionError error); +protected Q_SLOTS: + virtual void handlePreferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless); + virtual void handleNewConfigurationActivated(); + virtual void handleStateChanged(QNetworkSession::State state); + virtual void handleOpened(); + virtual void handleClosed(); + virtual void handleError(QNetworkSession::SessionError error); private: + QNetworkConfiguration activeConfiguration(); + QNetworkSession *m_NetworkSession; }; +} // namespace WRT + #endif /* WEBNETWORKSESSION_H_ */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WrtTelService.rss --- a/browsercore/core/network/WrtTelService.rss Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WrtTelService.rss Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - NAME WTEL #include <eikon.rh> diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WrtTelServiceBr.cpp --- a/browsercore/core/network/WrtTelServiceBr.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WrtTelServiceBr.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * 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: * */ - // INCLUDE FILES #include <QObject> #include <QStringList> diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WrtTelServiceBr.h --- a/browsercore/core/network/WrtTelServiceBr.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WrtTelServiceBr.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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: * */ - // INCLUDE FILES #ifndef __WRTTELSERVICE_H #define __WRTTELSERVICE_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/WrtTelServiceBr_p.h --- a/browsercore/core/network/WrtTelServiceBr_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/WrtTelServiceBr_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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: * */ - // INCLUDE FILES #ifndef __WRTTELSERVICE_P_H #define __WRTTELSERVICE_P_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/networkdiskcache.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/core/network/networkdiskcache.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,789 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//#define QNETWORKDISKCACHE_DEBUG + +#ifndef QT_NO_NETWORKDISKCACHE + +#include "networkdiskcache.h" +#include "networkdiskcache_p.h" +#include "QtCore/qscopedpointer.h" + +#include <qfile.h> +#include <qdir.h> +#include <qdatetime.h> +#include <qdiriterator.h> +#include <qurl.h> + +#include <qdebug.h> + + +#define MAX_COMPRESSION_SIZE (1024 * 1024 * 3) +#define CACHE_SUBDIR_COUNT 16 + +QT_BEGIN_NAMESPACE + +/*! + \class QNetworkDiskCache + \since 4.5 + \inmodule QtNetwork + + \brief The QNetworkDiskCache class provides a very basic disk cache. + + QNetworkDiskCache stores each url in its own file inside of the + cacheDirectory using QDataStream. Files with a text MimeType + are compressed using qCompress. Each cache file starts with "cache_" + and ends in ".cache". Data is written to disk only in insert() + and updateMetaData(). + + Currently you can not share the same cache files with more then + one disk cache. + + QNetworkDiskCache by default limits the amount of space that the cache will + use on the system to 50MB. + + Note you have to set the cache directory before it will work. + + A network disk cache can be enabled by: + + \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 0 + + When sending requests, to control the preference of when to use the cache + and when to use the network, consider the following: + + \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 1 + + To check whether the response came from the cache or from the network, the + following can be applied: + + \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 2 +*/ + +/*! + Creates a new disk cache. The \a parent argument is passed to + QAbstractNetworkCache's constructor. + */ +NetworkDiskCache::NetworkDiskCache(QObject *parent) + : QAbstractNetworkCache(*new NetworkDiskCachePrivate, parent) +{ +} + +/*! + Destroys the cache object. This does not clear the disk cache. + */ +NetworkDiskCache::~NetworkDiskCache() +{ + Q_D(NetworkDiskCache); + QHashIterator<QIODevice*, QCacheItem*> it(d->inserting); + while (it.hasNext()) { + it.next(); + delete it.value(); + } +} + +/*! + Returns the location where cached files will be stored. +*/ +QString NetworkDiskCache::cacheDirectory() const +{ + Q_D(const NetworkDiskCache); + return d->cacheDirectory; +} + +/*! + Sets the directory where cached files will be stored to \a cacheDir + + QNetworkDiskCache will create this directory if it does not exists. + + Prepared cache items will be stored in the new cache directory when + they are inserted. + + \sa QDesktopServices::CacheLocation +*/ +void NetworkDiskCache::setCacheDirectory(const QString &cacheDir) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::setCacheDirectory()" << cacheDir; +#endif + Q_D(NetworkDiskCache); + if (cacheDir.isEmpty()) + return; + d->cacheDirectory = cacheDir; + QDir cDir(d->cacheDirectory); + d->cacheDirectory = cDir.absolutePath(); + if (!d->cacheDirectory.endsWith(QLatin1Char('/'))) + d->cacheDirectory += QLatin1Char('/'); + + QDir dir; + // Setup and create directories + if (!QFile::exists(d->cacheDirectory)) + { + // ### make a static QDir function for this... + dir.mkpath(d->cacheDirectory); + } + + QString subDirectory; + for (int i = 0; i < CACHE_SUBDIR_COUNT; i++) + { + subDirectory = d->cacheDirectory + QString("%1").arg(i, 0, 16) + QLatin1Char('/'); + if (!QFile::exists(subDirectory)) + { + dir.mkpath(subDirectory); + } + } + + // For Temporary Prepared Directory + dir.mkpath(d->cacheDirectory + QLatin1String("prepared/")); +} + +/*! + \reimp +*/ +qint64 NetworkDiskCache::cacheSize() const +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::cacheSize()"; +#endif + Q_D(const NetworkDiskCache); + if (d->cacheDirectory.isEmpty()) + return 0; + if (d->currentCacheSize < 0) { + NetworkDiskCache *that = const_cast<NetworkDiskCache*>(this); + that->d_func()->currentCacheSize = that->expire(); + } + return d->currentCacheSize; +} + +/*! + \reimp +*/ +QIODevice *NetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::prepare()" << metaData.url(); +#endif + Q_D(NetworkDiskCache); + if (!metaData.isValid() || !metaData.url().isValid() || !metaData.saveToDisk()) + return 0; + + if (d->cacheDirectory.isEmpty()) { + qWarning() << "NetworkDiskCache::prepare() The cache directory is not set"; + return 0; + } + + foreach (QNetworkCacheMetaData::RawHeader header, metaData.rawHeaders()) { + if (header.first.toLower() == "content-length") { + qint64 size = header.second.toInt(); + if (size > (maximumCacheSize() * 3)/4) + return 0; + break; + } + } + QScopedPointer<QCacheItem> cacheItem(new QCacheItem); + cacheItem->metaData = metaData; + + QIODevice *device = 0; + if (cacheItem->canCompress()) { + cacheItem->data.open(QBuffer::ReadWrite); + device = &(cacheItem->data); + } else { + QString templateName = d->tmpCacheFileName(); + QT_TRY { + cacheItem->file = new QTemporaryFile(templateName, &cacheItem->data); + } QT_CATCH(...) { + cacheItem->file = 0; + } + if (!cacheItem->file || !cacheItem->file->open()) { + qWarning() << "NetworkDiskCache::prepare() unable to open temporary file"; + cacheItem.reset(); + return 0; + } + cacheItem->writeHeader(cacheItem->file); + device = cacheItem->file; + } + d->inserting[device] = cacheItem.take(); + return device; +} + +/*! + \reimp +*/ +void NetworkDiskCache::insert(QIODevice *device) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::insert()" << device; +#endif + Q_D(NetworkDiskCache); + QHash<QIODevice*, QCacheItem*>::iterator it = d->inserting.find(device); + if (it == d->inserting.end()) { + qWarning() << "NetworkDiskCache::insert() called on a device we don't know about" << device; + return; + } + + d->storeItem(it.value()); + delete it.value(); + d->inserting.erase(it); +} + +// CRC32 implementation. +// Could be made into new API QByteArray:qChecksum32() +static const quint32 crc_tbl32[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, + 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, + 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, + 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, + 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, + 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, + 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, + 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, + 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, + 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, + 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, + 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, + 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, + 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, + 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, + 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, + 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, + 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, + 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, + 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, + 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, + 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, + 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, + 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, + 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, + 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, + 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, + 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, + 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, + 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, + 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, + 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, + 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, + 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, + 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +quint32 NetworkDiskCachePrivate::crc32(const char *data, uint len) +{ + const uchar *p = reinterpret_cast<const uchar *>(data); + const uchar *q = p + len; + const quint32 init = 0xFFFFFFFFL; + + quint32 crc32 = init; + while (p < q) { + crc32 = (crc32 >> 8) ^ crc_tbl32[(crc32 ^ *p++) & 0xffL]; + } + return crc32 ^ init ; +} + +void NetworkDiskCachePrivate::storeItem(QCacheItem *cacheItem) +{ + Q_Q(NetworkDiskCache); + + // just an idea of not caching anything more than 15k + //if (cacheItem->size() > (15*1024)) return; + + Q_ASSERT(cacheItem->metaData.saveToDisk()); + + QString fileName = cacheFileName(cacheItem->metaData.url()); + Q_ASSERT(!fileName.isEmpty()); + + if (QFile::exists(fileName)) { + if (!QFile::remove(fileName)) { + qWarning() << "NetworkDiskCache: couldn't remove the cache file " << fileName; + return; + } + } + + if (currentCacheSize > 0) + currentCacheSize += 1024 + cacheItem->size(); + currentCacheSize = q->expire(); + if (!cacheItem->file) { + QString templateName = tmpCacheFileName(); + cacheItem->file = new QTemporaryFile(templateName, &cacheItem->data); + if (cacheItem->file->open()) { + cacheItem->writeHeader(cacheItem->file); + cacheItem->writeCompressedData(cacheItem->file); + } + } + + if (cacheItem->file + && cacheItem->file->isOpen() + && cacheItem->file->error() == QFile::NoError) { + cacheItem->file->setAutoRemove(false); + // ### use atomic rename rather then remove & rename + if (cacheItem->file->rename(fileName)) + currentCacheSize += cacheItem->file->size(); + else + cacheItem->file->setAutoRemove(true); + } + if (cacheItem->metaData.url() == lastItem.metaData.url()) + lastItem.reset(); +} + +/*! + \reimp +*/ +bool NetworkDiskCache::remove(const QUrl &url) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::remove()" << url; +#endif + Q_D(NetworkDiskCache); + + // remove is also used to cancel insertions, not a common operation + QHashIterator<QIODevice*, QCacheItem*> it(d->inserting); + while (it.hasNext()) { + it.next(); + QCacheItem *item = it.value(); + if (item && item->metaData.url() == url) { + delete item; + d->inserting.remove(it.key()); + return true; + } + } + + if (d->lastItem.metaData.url() == url) + d->lastItem.reset(); + return d->removeFile(d->cacheFileName(url)); +} + +/*! + Put all of the misc file removing into one function to be extra safe + */ +bool NetworkDiskCachePrivate::removeFile(const QString &file) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::removeFile()" << file; +#endif + if (file.isEmpty()) + return false; + QFileInfo info(file); + QString fileName = info.fileName(); + qint64 size = info.size(); + if (QFile::remove(file)) { + currentCacheSize -= size; + return true; + } + return false; +} + +/*! + \reimp +*/ +QNetworkCacheMetaData NetworkDiskCache::metaData(const QUrl &url) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::metaData()" << url; +#endif + Q_D(NetworkDiskCache); + if (d->lastItem.metaData.url() == url) + return d->lastItem.metaData; + return fileMetaData(d->cacheFileName(url)); +} + +/*! + Returns the QNetworkCacheMetaData for the cache file \a fileName. + + If \a fileName is not a cache file QNetworkCacheMetaData will be invalid. + */ +QNetworkCacheMetaData NetworkDiskCache::fileMetaData(const QString &fileName) const +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::fileMetaData()" << fileName; +#endif + Q_D(const NetworkDiskCache); + QFile file(fileName); + if (!file.open(QFile::ReadOnly)) + return QNetworkCacheMetaData(); + if (!d->lastItem.read(&file, false)) { + file.close(); + NetworkDiskCachePrivate *that = const_cast<NetworkDiskCachePrivate*>(d); + that->removeFile(fileName); + } + return d->lastItem.metaData; +} + +/*! + \reimp +*/ +QIODevice *NetworkDiskCache::data(const QUrl &url) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::data()" << url; +#endif + Q_D(NetworkDiskCache); + QScopedPointer<QBuffer> buffer; + if (!url.isValid()) + return 0; + if (d->lastItem.metaData.url() == url && d->lastItem.data.isOpen()) { + buffer.reset(new QBuffer); + buffer->setData(d->lastItem.data.data()); + } else { + QScopedPointer<QFile> file(new QFile(d->cacheFileName(url))); + if (!file->open(QFile::ReadOnly | QIODevice::Unbuffered)) + return 0; + + if (!d->lastItem.read(file.data(), true)) { + file->close(); + remove(url); + return 0; + } + if (d->lastItem.data.isOpen()) { + // compressed + buffer.reset(new QBuffer); + buffer->setData(d->lastItem.data.data()); + } else { + buffer.reset(new QBuffer); + // ### verify that QFile uses the fd size and not the file name + qint64 size = file->size() - file->pos(); + const uchar *p = 0; +#ifndef Q_OS_WINCE + p = file->map(file->pos(), size); +#endif + if (p) { + buffer->setData((const char *)p, size); + file.take()->setParent(buffer.data()); + } else { + buffer->setData(file->readAll()); + } + } + } + buffer->open(QBuffer::ReadOnly); + return buffer.take(); +} + +/*! + \reimp +*/ +void NetworkDiskCache::updateMetaData(const QNetworkCacheMetaData &metaData) +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::updateMetaData()" << metaData.url(); +#endif + QUrl url = metaData.url(); + QIODevice *oldDevice = data(url); + if (!oldDevice) { +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::updateMetaData(), no device!"; +#endif + return; + } + + QIODevice *newDevice = prepare(metaData); + if (!newDevice) { +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::updateMetaData(), no new device!" << url; +#endif + return; + } + char data[1024]; + while (!oldDevice->atEnd()) { + qint64 s = oldDevice->read(data, 1024); + newDevice->write(data, s); + } + delete oldDevice; + insert(newDevice); +} + +/*! + Returns the current maximum size for the disk cache. + + \sa setMaximumCacheSize() + */ +qint64 NetworkDiskCache::maximumCacheSize() const +{ + Q_D(const NetworkDiskCache); + return d->maximumCacheSize; +} + +/*! + Sets the maximum size of the disk cache to be \a size. + + If the new size is smaller then the current cache size then the cache will call expire(). + + \sa maximumCacheSize() + */ +void NetworkDiskCache::setMaximumCacheSize(qint64 size) +{ + Q_D(NetworkDiskCache); + bool expireCache = (size < d->maximumCacheSize); + d->maximumCacheSize = size; + if (expireCache) + d->currentCacheSize = expire(); +} + +/*! + Cleans the cache so that its size is under the maximum cache size. + Returns the current size of the cache. + + When the current size of the cache is greater than the maximumCacheSize() + older cache files are removed until the total size is less then 90% of + maximumCacheSize() starting with the oldest ones first using the file + creation date to determine how old a cache file is. + + Subclasses can reimplement this function to change the order that cache + files are removed taking into account information in the application + knows about that QNetworkDiskCache does not, for example the number of times + a cache is accessed. + + Note: cacheSize() calls expire if the current cache size is unknown. + + \sa maximumCacheSize(), fileMetaData() + */ +qint64 NetworkDiskCache::expire() +{ + Q_D(NetworkDiskCache); + if (d->currentCacheSize >= 0 && d->currentCacheSize < maximumCacheSize()) + return d->currentCacheSize; + + if (cacheDirectory().isEmpty()) { + qWarning() << "NetworkDiskCache::expire() The cache directory is not set"; + return 0; + } + + QDir::Filters filters = QDir::AllDirs | QDir:: Files | QDir::NoDotAndDotDot; + QDirIterator it(cacheDirectory(), filters, QDirIterator::Subdirectories); + + QMultiMap<QDateTime, QString> cacheItems; + qint64 totalSize = 0; + while (it.hasNext()) { + QString path = it.next(); + QFileInfo info = it.fileInfo(); + QString fileName = info.fileName(); + cacheItems.insert(info.created(), path); + totalSize += info.size(); + } + + int removedFiles = 0; + qint64 goal = (maximumCacheSize() * 9) / 10; + QMultiMap<QDateTime, QString>::const_iterator i = cacheItems.constBegin(); + while (i != cacheItems.constEnd()) { + if (totalSize < goal) + break; + QString name = i.value(); + QFile file(name); + qint64 size = file.size(); + file.remove(); + totalSize -= size; + ++removedFiles; + ++i; + } +#if defined(QNETWORKDISKCACHE_DEBUG) + if (removedFiles > 0) { + qDebug() << "NetworkDiskCache::expire()" + << "Removed:" << removedFiles + << "Kept:" << cacheItems.count() - removedFiles; + } +#endif + if (removedFiles > 0) + d->lastItem.reset(); + return totalSize; +} + +/*! + \reimp +*/ +void NetworkDiskCache::clear() +{ +#if defined(QNETWORKDISKCACHE_DEBUG) + qDebug() << "NetworkDiskCache::clear()"; +#endif + Q_D(NetworkDiskCache); + qint64 size = d->maximumCacheSize; + d->maximumCacheSize = 0; + d->currentCacheSize = expire(); + d->maximumCacheSize = size; +} + +QByteArray NetworkDiskCachePrivate::generateId(const QUrl &url) const +{ + QUrl cleanUrl = url; + cleanUrl.setPassword(QString()); + cleanUrl.setFragment(QString()); + QByteArray blob = cleanUrl.toEncoded(); + + QByteArray hash; + hash.setNum(crc32(blob.data(), blob.length()), 16); + return hash; +} + +QString NetworkDiskCachePrivate::tmpCacheFileName() const +{ + return cacheDirectory + QLatin1String("prepared/") + QLatin1String("XXXXXX"); +} + +QString NetworkDiskCachePrivate::cacheFileName(const QUrl &url) const +{ + if (!url.isValid()) + return QString(); + + // Directories were already created during setup phase. + QString subDirectory; + QByteArray filenameID; + filenameID = generateId(url); + subDirectory = cacheDirectory + QLatin1Char(filenameID.at(0)) + QLatin1Char('/'); + + return subDirectory + QLatin1String(filenameID); +} + +/*! + We compress small text and JavaScript files. + */ +bool QCacheItem::canCompress() const +{ + bool sizeOk = false; + bool typeOk = false; + foreach (QNetworkCacheMetaData::RawHeader header, metaData.rawHeaders()) { + if (header.first.toLower() == "content-length") { + qint64 size = header.second.toLongLong(); + if (size > MAX_COMPRESSION_SIZE) + return false; + else + sizeOk = true; + } + + if (header.first.toLower() == "content-type") { + QByteArray type = header.second; + if (type.startsWith("text/") + || (type.startsWith("application/") + && (type.endsWith("javascript") || type.endsWith("ecmascript")))) + typeOk = true; + else + return false; + } + if (sizeOk && typeOk) + return true; + } + return false; +} + +enum +{ + CacheMagic = 0xe8, + CurrentCacheVersion = 7 +}; + +void QCacheItem::writeHeader(QFile *device) const +{ + QDataStream out(device); + + out << qint32(CacheMagic); + out << qint32(CurrentCacheVersion); + out << metaData; + bool compressed = canCompress(); + out << compressed; +} + +void QCacheItem::writeCompressedData(QFile *device) const +{ + QDataStream out(device); + + out << qCompress(data.data()); +} + +/*! + Returns false if the file is a cache file, + but is an older version and should be removed otherwise true. + */ +bool QCacheItem::read(QFile *device, bool readData) +{ + reset(); + + QDataStream in(device); + + qint32 marker; + qint32 v; + in >> marker; + in >> v; + if (marker != CacheMagic) + return true; + + // If the cache magic is correct, but the version is not we should remove it + if (v != CurrentCacheVersion) + return false; + + bool compressed; + QByteArray dataBA; + in >> metaData; + in >> compressed; + if (readData && compressed) { + in >> dataBA; + data.setData(qUncompress(dataBA)); + data.open(QBuffer::ReadOnly); + } + return metaData.isValid(); +} + +QT_END_NAMESPACE + +#endif // QT_NO_NETWORKDISKCACHE diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/networkdiskcache.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/core/network/networkdiskcache.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef NETWORKDISKCACHE_H +#define NETWORKDISKCACHE_H + +#include <QtNetwork/qabstractnetworkcache.h> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Network) + +#ifndef QT_NO_NETWORKDISKCACHE + +class NetworkDiskCachePrivate; +class NetworkDiskCache : public QAbstractNetworkCache +{ + Q_OBJECT + +public: + explicit NetworkDiskCache(QObject *parent = 0); + ~NetworkDiskCache(); + + QString cacheDirectory() const; + void setCacheDirectory(const QString &cacheDir); + + qint64 maximumCacheSize() const; + void setMaximumCacheSize(qint64 size); + + qint64 cacheSize() const; + QNetworkCacheMetaData metaData(const QUrl &url); + void updateMetaData(const QNetworkCacheMetaData &metaData); + QIODevice *data(const QUrl &url); + bool remove(const QUrl &url); + QIODevice *prepare(const QNetworkCacheMetaData &metaData); + void insert(QIODevice *device); + + QNetworkCacheMetaData fileMetaData(const QString &fileName) const; + +public Q_SLOTS: + void clear(); + +protected: + virtual qint64 expire(); + +private: + Q_DECLARE_PRIVATE(NetworkDiskCache) + Q_DISABLE_COPY(NetworkDiskCache) +}; + +#endif // QT_NO_NETWORKDISKCACHE + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // NETWORKDISKCACHE_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/networkdiskcache_p.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/core/network/networkdiskcache_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,123 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef NETWORKDISKCACHE_P_H +#define NETWORKDISKCACHE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "private/qabstractnetworkcache_p.h" + +#include <qbuffer.h> +#include <qhash.h> +#include <qtemporaryfile.h> + +QT_BEGIN_NAMESPACE + +class QFile; + +class QCacheItem +{ +public: + QCacheItem() : file(0) + { + } + ~QCacheItem() + { + reset(); + } + + QNetworkCacheMetaData metaData; + QBuffer data; + QTemporaryFile *file; + inline qint64 size() const + { return file ? file->size() : data.size(); } + + inline void reset() { + metaData = QNetworkCacheMetaData(); + data.close(); + delete file; + file = 0; + } + void writeHeader(QFile *device) const; + void writeCompressedData(QFile *device) const; + bool read(QFile *device, bool readData); + + bool canCompress() const; +}; + +class NetworkDiskCachePrivate : public QAbstractNetworkCachePrivate +{ +public: + NetworkDiskCachePrivate() + : QAbstractNetworkCachePrivate() + , maximumCacheSize(1024 * 1024 * 50) + , currentCacheSize(-1) + {} + + QByteArray generateId(const QUrl &url) const; + QString cacheFileName(const QUrl &url) const; + QString tmpCacheFileName() const; + bool removeFile(const QString &file); + void storeItem(QCacheItem *item); + static quint32 crc32(const char *data, uint len); + + mutable QCacheItem lastItem; + QString cacheDirectory; + qint64 maximumCacheSize; + qint64 currentCacheSize; + + QHash<QIODevice*, QCacheItem*> inserting; + Q_DECLARE_PUBLIC(NetworkDiskCache) +}; + +QT_END_NAMESPACE + +#endif // NETWORKDISKCACHE_P_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/networkerrorreply.cpp --- a/browsercore/core/network/networkerrorreply.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/networkerrorreply.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "networkerrorreply.h" namespace WRT { diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/networkerrorreply.h --- a/browsercore/core/network/networkerrorreply.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/networkerrorreply.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __WRTNETWORKREPLY_H__ #define __WRTNETWORKREPLY_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/webcookiejar.cpp --- a/browsercore/core/network/webcookiejar.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/webcookiejar.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,43 +1,37 @@ /* * 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: * */ - #include "webcookiejar.h" -//#include "wrtsettings.h" #include "bedrockprovisioning.h" -#include <qdatetime.h> -#include <qdesktopservices.h> -#include <qdir.h> -#include <qfile.h> -#include <qmetaobject.h> -#include <qsettings.h> -#include <qurl.h> +#include <QDateTime> +#include <QDir> +#include <QFile> +#include <QMetaObject> +#include <QSettings> +#include <QUrl> -#include <qdebug.h> +#include <QDebug> static const unsigned int JAR_VERSION = 1; -const QString DOTCOM = ".com"; -const QString DOTEDU = ".edu"; -const QString DOTNET = ".net"; -const QString DOTORG = ".org"; -const QString DOTGOV = ".gov"; -const QString DOTMIL = ".mil"; -const QString DOTINT = ".int"; // for debugging webcookiejar, uncomment this (and have QT debug enabled) //#define DEBUG_WEBCOOKIEJAR 1 @@ -86,15 +80,7 @@ : QNetworkCookieJar(parent) , m_loaded(false) { -#ifndef QT_NO_DESKTOPSERVICES - m_cookiesDir = QDir::toNativeSeparators(QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1Char('/')); -#else - m_cookiesDir = QDir::homePath() + QLatin1String("/:"); -#endif -#ifdef Q_OS_SYMBIAN - if (m_cookiesDir.startsWith("Z")) - m_cookiesDir.replace(0,1,"C"); -#endif + m_cookiesDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory"); m_cookiesFile = m_cookiesDir + QLatin1String("cookies.ini"); } @@ -236,15 +222,11 @@ cookie.setDomain(domainStartWithDot); } - if (domain.compare(DOTCOM, Qt::CaseInsensitive) == 0 - || domain.compare(DOTEDU, Qt::CaseInsensitive) == 0 - || domain.compare(DOTNET, Qt::CaseInsensitive) == 0 - || domain.compare(DOTORG, Qt::CaseInsensitive) == 0 - || domain.compare(DOTGOV, Qt::CaseInsensitive) == 0 - || domain.compare(DOTMIL, Qt::CaseInsensitive) == 0 - || domain.compare(DOTINT, Qt::CaseInsensitive) == 0) - continue; - + // reject if domain is like ".com" + // (i.e., reject if domain does not contain embedded dots, see RFC 2109 section 4.3.2) + if (domain.lastIndexOf(QLatin1Char('.')) == 0) + continue; // not accepted + // set default path if (cookie.path().compare(QString()) == 0) cookie.setPath(urlPath.left(urlPath.lastIndexOf(QLatin1Char('/')))); diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/webcookiejar.h --- a/browsercore/core/network/webcookiejar.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/webcookiejar.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,27 +1,29 @@ /* * 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 COOKIEJAR_H #define COOKIEJAR_H -#include <qnetworkcookie.h> - -#include <qstringlist.h> +#include <QNetworkCookie> +#include <QStringList> namespace WRT { diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/webnetworkaccessmanager.cpp --- a/browsercore/core/network/webnetworkaccessmanager.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/webnetworkaccessmanager.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,30 +1,33 @@ /* * 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: * */ - #include <QNetworkRequest> #include <QNetworkReply> #include <QAuthenticator> - +#include <QNetworkInterface> #if QT_VERSION >= 0x040500 #include <QNetworkDiskCache> +// #include "networkdiskcache.h" #endif -//#include "wrtsettings.h" #include "bedrockprovisioning.h" #include "wrtbrowsercontainer.h" #include "webcookiejar.h" @@ -34,7 +37,7 @@ #include "networkerrorreply.h" #include "SchemeHandlerBr.h" -#include "qwebframe.h" +#include <QWebFrame> namespace WRT { @@ -44,50 +47,51 @@ m_reply = NULL; this->setCookieJar(m_cookieJar); connect(this, SIGNAL(authenticationRequired(QNetworkReply *, QAuthenticator *)), m_browserContainer, SLOT(slotAuthenticationRequired(QNetworkReply *, QAuthenticator *))); - connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy & , QAuthenticator * )), m_browserContainer, SLOT(slotProxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *))); + connect(this, SIGNAL(finished(QNetworkReply *)), this, SLOT(onfinished(QNetworkReply *))); setupCache(); setupNetworkProxy(); } -#ifdef NETWORK_DEBUG -void WebNetworkAccessManager::error(QNetworkReply::NetworkError) +int WebNetworkAccessManager::activeNetworkInterfaces() +{ + int count = 0; + QList<QNetworkInterface> allNIFs = QNetworkInterface::allInterfaces(); + foreach (QNetworkInterface aNIF, allNIFs) { + if (aNIF.isValid() && aNIF.flags() & QNetworkInterface::IsUp && !(aNIF.flags() & QNetworkInterface::IsLoopBack)) + count++; + } + return count; +} + +void WebNetworkAccessManager::onfinished(QNetworkReply* reply) { -// qDebug() << "Network::error:" << n_reply->error() << " String:" << n_reply->errorString(); -// QString errorNumber = QString::number(n_reply->error() ); - QNetworkReply::NetworkError error = n_reply->error(); - - if ( error != 5 && error != 0 ) - { - switch ( error ) - { - case QNetworkReply::HostNotFoundError: - WebDialogProvider::showTimedMessage(NULL, "No Connection ", 2000); - break; - /* - // ContentNotFoundError cause many problems. For now, we ignore - // TODO: We will find more graceful way to handle this error - case QNetworkReply::ContentNotFoundError: - WebDialogProvider::showTimedMessage(NULL, "Content Not Found", 2000); - break; - */ - case QNetworkReply::ProtocolUnknownError: - WebDialogProvider::showTimedMessage(NULL, "Protocol Unknown", 2000); - break; + QNetworkReply::NetworkError networkError = reply->error(); + QString requestUrl = reply->request().url().toString(); - default: - break; // Ignore other error msgs + if ( networkError != QNetworkReply::OperationCanceledError && + networkError != QNetworkReply::NoError ) + { + QString errorMsg = reply->errorString(); + if ( activeNetworkInterfaces() == 0 ) { + errorMsg = "Network not available"; + } else { + int httpErrorCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + if ( httpErrorCode ) { + QString httpErrorStr = QString ("HTTP %1 ").arg(httpErrorCode); + QString httpReasonStr = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(); + errorMsg = httpErrorStr + httpReasonStr; + } + } + emit networkErrorHappened(errorMsg); + emit networkErrorUrl(requestUrl); } - } - return; } -#endif WebNetworkAccessManager::~WebNetworkAccessManager() { delete m_cookieJar; - //setCache(NULL); - delete m_reply; + setCache(NULL); } QNetworkReply* WebNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) @@ -95,6 +99,11 @@ QNetworkRequest req = request; req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); + // improve performance by + // load from cache if available, otherwise load from network. + // Note that this can return possibly stale (but not expired) items from cache. + // QNetworkRequest::PreferNetwork is default value + req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); if (m_reply != NULL) { delete m_reply; @@ -104,9 +113,9 @@ if(m_browserContainer->mainFrame()) { - if(m_browserContainer->mainFrame()->url().scheme().contains("https")) { + if(m_browserContainer->mainFrame()->url().scheme() == "https") { - if (op == QNetworkAccessManager::PostOperation && req.url().scheme().contains("http")) { + if (op == QNetworkAccessManager::PostOperation && req.url().scheme() == "http") { m_text = tr("Secure Page Warning:"); m_informativeText = tr("Do you want to continue?"); @@ -122,14 +131,16 @@ } } } + if(request.url().scheme() == "qrc") + { + reply = new NetworkErrorReply(QNetworkReply::ProtocolUnknownError, "Unknown scheme", request.url()); + QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection); + } + if (reply == NULL) { reply = createRequestHelper(op, req, outgoingData); } -#ifdef NETWORK_DEBUG - n_reply = reply; - connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), - this, SLOT(error(QNetworkReply::NetworkError))); -#endif + return reply; } @@ -181,6 +192,7 @@ QNetworkProxy proxy; QString proxyString = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("NetworkProxy"); + QString portString = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("NetworkPort"); if (proxyString.isEmpty()) { @@ -192,7 +204,7 @@ { proxy.setType(QNetworkProxy::HttpProxy); proxy.setHostName(proxyString); - proxy.setPort(8080); + proxy.setPort(portString.toInt()); } setProxy(proxy); @@ -204,6 +216,7 @@ #if QT_VERSION >= 0x040500 qDiskCache = new QNetworkDiskCache(this); +// qDiskCache = new NetworkDiskCache(this); if ( !BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DiskCacheEnabled").toBool() ) return; diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/network/webnetworkaccessmanager.h --- a/browsercore/core/network/webnetworkaccessmanager.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/network/webnetworkaccessmanager.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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 __WEBNETWORKACCESSMANAGER_H__ #define __WEBNETWORKACCESSMANAGER_H__ @@ -25,6 +28,7 @@ #if QT_VERSION >= 0x040500 #include <QNetworkDiskCache> +// #include "networkdiskcache.h" #endif namespace WRT { @@ -43,7 +47,8 @@ virtual ~WebNetworkAccessManager(); void onMessageBoxResponse(int retValue); - + int activeNetworkInterfaces(); + public slots: protected: @@ -56,24 +61,23 @@ QNetworkReply* createRequestHelper(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0); private slots: -#ifdef NETWORK_DEBUG - void error(QNetworkReply::NetworkError code); -#endif + void onfinished(QNetworkReply* reply); private: WrtBrowserContainer* m_browserContainer; CookieJar* m_cookieJar; QNetworkReply* m_reply; - QNetworkReply* n_reply; // Not owned, do not delete QNetworkRequest* m_req; #if QT_VERSION >= 0x040500 QNetworkDiskCache *qDiskCache; +// NetworkDiskCache *qDiskCache; #endif signals: void showMessageBox(WRT::MessageBoxProxy* data); - + void networkErrorHappened(const QString & msg); + void networkErrorUrl(const QUrl & url); }; } #endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/scriptobjects.cpp --- a/browsercore/core/scriptobjects.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/scriptobjects.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,19 +1,22 @@ /* * Copyright (c) 2010 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: * */ - #include "scriptobjects.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/scriptobjects.h --- a/browsercore/core/scriptobjects.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/scriptobjects.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 SCRIPTOBJECTS_H #define SCRIPTOBJECTS_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/singleton.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browsercore/core/singleton.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,67 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* This defines both Meyers Singleton and Gamma Singleton template. +*/ + + +#ifndef __SINGLETON_H +#define __SINGLETON_H + +/* + * This is how a Gamma Singleton would instantiate its object. + */ +template <class T> struct CreateGamma { + static T* Create() { return new T; } +}; + +/* + * This is how a Meyers Singleton would instantiate its object. + */ +template <class T> struct CreateMeyers { + static T* Create() { + static T _instance; + return &_instance; + } +}; + +/* + * This Singleton class accepts different creation policies. + */ +template <class T, template<class> class CreationPolicy=CreateMeyers> +class Singleton { +public: + static T& Instance() { + if (!m_pInstance) + m_pInstance=CreationPolicy<T>::Create(); + return *m_pInstance; +} + +private: + Singleton(); // hide constrcutor + ~Singleton(); // hide desctructor + Singleton(Singleton const&); // hide copy constructor + Singleton& operator=(Singleton const&); // hide assignment operator + + static T* m_pInstance; +}; + +template <class T, template<class> class C> +T* Singleton<T,C>::m_pInstance=0; + +#endif // __SINGLETON_H \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webcursornavigation.cpp --- a/browsercore/core/webcursornavigation.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,313 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "qwidget.h" -#include "qcursor.h" -#include "qwebpage.h" -#include "qwebview.h" -#include "qwebframe.h" -#include "qwebelement.h" -#include "webcursornavigation.h" -#include "webcontentview.h" - -namespace WRT { - -const int KPageViewScrollRange = 60; -const int KNormalScrollRange = 40; -const int KFlipAdjust = 10; -const int KMiddleStep = 5; -const int KFullStep = 14; -const int KMinimumParagraphHeight = 30; -const int KHitTestDistance = 100; - -/*! - \class WebCursorNavigation - \since cwrt 1.0 - \brief cwrt navigation. - - \sa WebNavigation, WebTouchNavigation, WebDirectionalNavigation, WebHtmlTabIndexedNavigation -*/ -WebCursorNavigation::WebCursorNavigation(QWebPage* webPage,QObject* view) - : m_webPage(webPage) - , m_view(view) - , m_cursorPosition(0,0) - , m_flipcounter(1) - , m_direction(0) - , m_lastdirection(0) -{ - install(); -} - -/*! -*/ -WebCursorNavigation::~WebCursorNavigation() -{ - uninstall(); -} - -void WebCursorNavigation::install() -{ - m_view->installEventFilter(this); - connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(scrollTimeout())); - connect(&m_keypressTimer, SIGNAL(timeout()), this, SLOT(keypressTimeout())); - connect(m_webPage, SIGNAL(linkHovered(const QString&, const QString&, const QString &)), - this, SLOT(showLinkHover(const QString&, const QString&))); -} - -void WebCursorNavigation::uninstall() -{ - disconnect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(scrollTimeout())); - disconnect(&m_keypressTimer, SIGNAL(timeout()), this, SLOT(keypressTimeout())); - disconnect(m_webPage, SIGNAL(linkHovered(const QString&, const QString&, const QString &)), - this, SLOT(showLinkHover(const QString&, const QString&))); - m_view->removeEventFilter(this); -} - -bool WebCursorNavigation::eventFilter(QObject *object, QEvent *event) -{ - if (object == m_view) { - switch (event->type()) { - case QEvent::KeyPress: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - keyPressEvent(ev); - return ev->isAccepted(); - } - case QEvent::KeyRelease: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - keyReleaseEvent(ev); - return ev->isAccepted(); - } - default: - break; - } - } - return false; -} - -/*! - Timeout for long keypress. - \sa scrollTimeout() -*/ -void WebCursorNavigation::keypressTimeout() -{ - if (!m_scrollTimer.isActive()) - scrollTimeout(); -} - -/*! - Timeout for scroller. Scrolls the page on a timer every 50 miliseconds - \sa keypressTimeout() -*/ -void WebCursorNavigation::scrollTimeout() -{ - if (!scroll(m_direction)) - moveCursor(m_direction); - - if (!m_scrollTimer.isActive()) - m_scrollTimer.start(50); -} - -/*! - If the key is directional, starts the keyPress timer. The cursor navigation is processed on keyReleaseEvent. - If the key is <Select> or <Return>, eat the event; we'll do that action once on keyRelease. - Otherwise, send the keyPress event onwards to QWebPage. -*/ -void WebCursorNavigation::keyPressEvent(QKeyEvent* ev) -{ - //stop fast scrolling timers - m_keypressTimer.stop(); - m_scrollTimer.stop(); - - if (ev->key() == Qt::Key_Up || - ev->key() == Qt::Key_Down || - ev->key() == Qt::Key_Left || - ev->key() == Qt::Key_Right ) { - - if (!m_keypressTimer.isActive()) - m_keypressTimer.start(300); - - m_direction = ev->key(); - } - - if (ev->key() == Qt::Key_Return - || ev->key() == Qt::Key_Enter - || ev->key() == Qt::Key_Select) { - Qt::KeyboardModifier modifier = Qt::NoModifier; - QWebFrame* webFrame = m_webPage->frameAt(m_cursorPosition); - webFrame = (webFrame) ? webFrame : m_webPage->currentFrame(); - QWebHitTestResult htr = webFrame->hitTestContent(m_cursorPosition); - if (htr.element().tagName().toLower().compare("select")==0 && htr.element().hasAttribute("multiple")) - modifier = Qt::ControlModifier; - - QMouseEvent evpress(QEvent::MouseButtonPress, m_cursorPosition, Qt::LeftButton, Qt::NoButton, modifier); - m_webPage->event(&evpress); - } - -} - -/*! - If the key is directional the cursor navigation is processed. - If the key is a <Select> or <Return>, send a left button mouse press and release to QWebPage. - Otherwise just send the keyRelease event onwards to QWebPage. -*/ -void WebCursorNavigation::keyReleaseEvent(QKeyEvent* ev) -{ - //stop fast scrolling timers - m_keypressTimer.stop(); - m_scrollTimer.stop(); - - if (ev->key() == Qt::Key_Up - || ev->key() == Qt::Key_Down - || ev->key() == Qt::Key_Left - || ev->key() == Qt::Key_Right ) { - - if (!scroll(ev->key())) { - moveCursor(ev->key()); - QMouseEvent evmm(QEvent::MouseMove, m_cursorPosition, Qt::NoButton, Qt::NoButton, Qt::NoModifier); - m_webPage->event(&evmm); - } - } - - if (ev->key() == Qt::Key_Return - || ev->key() == Qt::Key_Enter - || ev->key() == Qt::Key_Select) { - Qt::KeyboardModifier modifier = Qt::NoModifier; - QWebFrame* webFrame = m_webPage->frameAt(m_cursorPosition); - webFrame = (webFrame) ? webFrame : m_webPage->currentFrame(); - QWebHitTestResult htr = webFrame->hitTestContent(m_cursorPosition); - if (htr.element().tagName().toLower().compare("select")==0 && htr.element().hasAttribute("multiple")) - modifier = Qt::ControlModifier; - - QMouseEvent evrel(QEvent::MouseButtonRelease, m_cursorPosition, Qt::LeftButton, Qt::NoButton, modifier); - m_webPage->event(&evrel); - } -} - -/*! - Returns true if the cursor is over a editable area -*/ -bool WebCursorNavigation::isContentEditable() -{ - QWebFrame* webFrame = m_webPage->frameAt(m_cursorPosition); - webFrame = (webFrame) ? webFrame : m_webPage->currentFrame(); - QWebHitTestResult htr = webFrame->hitTestContent(m_cursorPosition); - return htr.isContentEditable(); -} - -/*! - Moves the cursor a fixed interval in the given direction -*/ -void WebCursorNavigation::moveCursor(int direction) -{ - QRect rect(0, 0, - m_webPage->viewportSize().width(), - m_webPage->viewportSize().height()); - - switch (direction) { - case Qt::Key_Left: { - m_flipcounter = (m_lastdirection == Qt::Key_Right) ? ++m_flipcounter : 1; - int dx = m_cursorPosition.x() - (KFullStep / m_flipcounter); - m_cursorPosition.setX((dx > 0) ? dx : 0); - } - break; - case Qt::Key_Right: { - m_flipcounter = (m_lastdirection == Qt::Key_Left) ? ++m_flipcounter : 1; - int dx = m_cursorPosition.x() + (KFullStep / m_flipcounter); - m_cursorPosition.setX((dx < rect.width() - KFullStep) ? dx : rect.width() - KFullStep); - } - break; - case Qt::Key_Up: { - m_flipcounter = (m_lastdirection == Qt::Key_Down) ? ++m_flipcounter : 1; - int dy = m_cursorPosition.y() - (KFullStep / m_flipcounter); - m_cursorPosition.setY((dy > 0) ? dy : 0); - } - break; - case Qt::Key_Down : { - m_flipcounter = (m_lastdirection == Qt::Key_Up) ? ++m_flipcounter : 1; - int dy = m_cursorPosition.y() + (KFullStep / m_flipcounter); - m_cursorPosition.setY((dy < rect.height() - KFullStep) ? dy : rect.height() - KFullStep); - } - break; - } - m_lastdirection = direction; - QCursor::setPos(static_cast<WebContentWidget*>(m_view)->mapToGlobal(m_cursorPosition).toPoint()); -} - -/*! - Scrolls QWebFrame a fixed interval in a given direction. -*/ -bool WebCursorNavigation::scroll(int direction) -{ - QWebFrame* webFrame = m_webPage->frameAt(m_cursorPosition); - webFrame = (webFrame) ? webFrame : m_webPage->currentFrame(); - - QPoint scrollPosition = webFrame->scrollPosition(); - QRect rect(QPoint(0,0),m_webPage->viewportSize()); - int xmargin = 2 * rect.width() / 5; - int ymargin = 2 * rect.height() / 5; - - switch (direction) { - case Qt::Key_Left : - if (m_cursorPosition.x() < rect.x() + xmargin) - webFrame->scroll(-KNormalScrollRange, 0); - break; - case Qt::Key_Right: - if (m_cursorPosition.x() > (rect.right() - xmargin)) - webFrame->scroll(KNormalScrollRange, 0); - break; - case Qt::Key_Up: - if (m_cursorPosition.y() < rect.y() + ymargin) - webFrame->scroll(0, -KNormalScrollRange); - break; - case Qt::Key_Down: - if (m_cursorPosition.y() > (rect.bottom() - ymargin)) - webFrame->scroll(0, KNormalScrollRange); - break; - } - - if (scrollPosition.y() == 0 || webFrame->scrollPosition().y() == 0) { - emit pageScrollPositionZero(); - } - return scrollPosition != webFrame->scrollPosition(); -} - - -/*! - Returns the distance to scroll to the nearest edge of a text paragraph. -*/ -int WebCursorNavigation::getNearestEdge(int scrollRange, int direction) -{ - QSize size = m_webPage->viewportSize(); - //Identify the number of hit tests needed - int hitTestCount = size.height() / KHitTestDistance; - int x = direction == Qt::Key_Right ? scrollRange : 0; - QPoint pos(x,KHitTestDistance); - for(int i=0;i<hitTestCount;i++) { - QWebHitTestResult htr = m_webPage->mainFrame()->hitTestContent(pos); - QRect rect = htr.boundingRect(); - QPoint scrollPosition = m_webPage->mainFrame()->scrollPosition(); - int d = direction == Qt::Key_Right ? rect.x() - scrollPosition.x() : pos.x() - rect.x(); - if(d > 0 && scrollRange > d && rect.height() > KMinimumParagraphHeight) - scrollRange = d; - pos = QPoint(pos.x(), pos.y() + (i + 1) * KHitTestDistance); - } - - return scrollRange; -} -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webcursornavigation.h --- a/browsercore/core/webcursornavigation.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBCURSORNAVIGATION_H -#define WEBCURSORNAVIGATION_H - - -#include <qobject.h> -#include <qevent.h> -#include <qtimer.h> -#include <qpixmap.h> - -class QWebPage; - -namespace WRT { - - class WebCursorNavigation : public QObject - { - Q_OBJECT - public: - WebCursorNavigation(QWebPage* webPage,QObject* view); - virtual ~WebCursorNavigation(); - - void install(); - void uninstall(); - void setPage( QWebPage * page){ m_webPage = page ;} - - signals: - void pageScrollPositionZero(); - - protected slots: - void keypressTimeout(); - void scrollTimeout(); - - protected: - void keyPressEvent(QKeyEvent* ev); - void keyReleaseEvent(QKeyEvent* ev); - bool isContentEditable(); - bool eventFilter(QObject *object, QEvent *event); - bool scroll(int direction); - void moveCursor(int direction); - int getNearestEdge(int scrollRange,int direction); - - - private: - QWebPage* m_webPage; - QObject* m_view; - QPoint m_cursorPosition; - int m_flipcounter; - int m_direction; - int m_lastdirection; - QTimer m_keypressTimer; - QTimer m_scrollTimer; - - }; -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webdirectionalnavigation.cpp --- a/browsercore/core/webdirectionalnavigation.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,403 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "qmath.h" -#include "qpainter.h" -#include "qwebpage.h" -#include "qwebview.h" -#include "qwebframe.h" -#include "qwebelement.h" -#include "webdirectionalnavigation.h" - -namespace WRT { - -const int KInitialSize = 20; -const int KNormalScrollRange = 40; -const int KFullStep = 14; -const double KMaxDistance = 1000000; - -/*! - \class WebDirectionalNavigation - \since cwrt 1.0 - \brief cwrt navigation. - - \sa WebNavigation, WebTouchNavigation, WebCursorNavigation, WebHtmlTabIndexedNavigation -*/ -WebDirectionalNavigation::WebDirectionalNavigation(QWebPage* webPage,QObject* view) : - m_webPage(webPage) -, m_view(view) -{ - install(); -} - -WebDirectionalNavigation::~WebDirectionalNavigation() -{ - uninstall(); -} - -void WebDirectionalNavigation::install() -{ - m_view->installEventFilter(this); - //initiallayoutCompleted(); -} - -void WebDirectionalNavigation::uninstall() -{ - if (m_view) - m_view->removeEventFilter(this); -} - -void WebDirectionalNavigation::initiallayoutCompleted() -{ - m_webElement = m_webPage->currentFrame()->findFirstElement(QString("a,input,select,textarea,object")); - if (!m_webElement.isNull()) { - m_webElement.setFocus(); - m_focusPoint = m_webElement.geometry().topLeft(); - setCurrentFrameScrollPosition(m_focusPoint); - } -} - -double WebDirectionalNavigation::calculateElementDistance(int direction, const QRect& possibleRect) -{ - // Roughly based on this algorithm http://www.w3.org/TR/WICD/#nav-distance-fkt - // Deviates in that the overlap is not calculated. Instead, if there is any overlap - // selection is restricted to x or y direction only. This helps for differnt size elments - // all lying on the same plane, but might mess up backtracking the naviation path. - - QRect focusedRect(0,0,1,1); - if (!m_webElement.isNull()) - focusedRect = QRect(m_webElement.geometry()); - - //calculate the next focuspoint - switch (direction) { - case Qt::Key_Up: - if (m_focusPoint.x() < focusedRect.x()) - m_focusPoint.setX(focusedRect.x()); - else if (m_focusPoint.x() > focusedRect.right()) - m_focusPoint.setX(focusedRect.right()); - m_focusPoint.setY(focusedRect.y()); - break; - case Qt::Key_Down: - if (m_focusPoint.x() < focusedRect.x()) - m_focusPoint.setX(focusedRect.x()); - else if (m_focusPoint.x() > focusedRect.right()) - m_focusPoint.setX(focusedRect.right()); - m_focusPoint.setY(focusedRect.bottom()); - break; - case Qt::Key_Right: - m_focusPoint.setX(focusedRect.right()); - if (m_focusPoint.y() < focusedRect.y()) - m_focusPoint.setY(focusedRect.y()); - else if (m_focusPoint.y() > focusedRect.bottom()) - m_focusPoint.setY(focusedRect.bottom()); - break; - case Qt::Key_Left: - m_focusPoint.setX(focusedRect.x()); - if (m_focusPoint.y() < focusedRect.y()) - m_focusPoint.setY(focusedRect.y()); - else if (m_focusPoint.y() > focusedRect.bottom()) - m_focusPoint.setY(focusedRect.bottom()); - break; - } - - // Make sure the rectangle falls within the search area - if (direction == Qt::Key_Up && possibleRect.bottom() > m_focusPoint.y() - || direction == Qt::Key_Down && possibleRect.y() < m_focusPoint.y() - || direction == Qt::Key_Right && possibleRect.x() < m_focusPoint.x() - || direction == Qt::Key_Left && possibleRect.right() > m_focusPoint.x()) - return KMaxDistance; - - // The absolute distance (dx or dy) on the navigation axis between the opposing edges of the currently focused - // element and each of the candidates. - double distanceX = 0; - double distanceY = 0; - - if (direction == Qt::Key_Up) { - // adjust the x distance based on the closest edge - if (m_focusPoint.x() < possibleRect.x()) - distanceX = possibleRect.x() - m_focusPoint.x(); - else if (m_focusPoint.x() > possibleRect.right()) - distanceX = m_focusPoint.x() - possibleRect.right(); - distanceY = m_focusPoint.y() - possibleRect.bottom(); - } else if (direction == Qt::Key_Down) { - // adjust the x distance based on the closest edge - if (m_focusPoint.x() < possibleRect.x()) - distanceX = possibleRect.x() - m_focusPoint.x(); - else if (m_focusPoint.x() > possibleRect.right()) - distanceX = m_focusPoint.x() - possibleRect.right(); - distanceY = possibleRect.y() - m_focusPoint.y(); - } else if (direction == Qt::Key_Right) { - distanceX = possibleRect.x() - m_focusPoint.x(); - // adjust the y distance based on the closest edge - if (m_focusPoint.y() < possibleRect.y()) - distanceY = possibleRect.y() - m_focusPoint.y(); - else if (m_focusPoint.y() > possibleRect.bottom()) - distanceY = m_focusPoint.y() - possibleRect.bottom(); - } else if (direction == Qt::Key_Left) { - distanceX = m_focusPoint.x() - possibleRect.right(); - // adjust the y distance based on the closest edge - if (m_focusPoint.y() < possibleRect.y()) - distanceY = possibleRect.y() - m_focusPoint.y(); - else if (m_focusPoint.y() > possibleRect.bottom()) - distanceY = m_focusPoint.y() - possibleRect.bottom(); - } - - // The absolute distance on the axis orthogonal to the navigation axis between - // the opposing edges of currently focused element and each of candidates - double displacement = 0; - - // The euclidean distance - double euclideanDist = sqrt(distanceX * distanceX + distanceY * distanceY); - - // Area of the document to search - QRect searchRect(m_webPage->currentFrame()->scrollPosition(),m_webPage->viewportSize()); - - if (direction == Qt::Key_Up || direction == Qt::Key_Down) { - // if the rectangles are on the same plane set the euclideanDist to zero to favor this navigation - if ((possibleRect.x() == focusedRect.x()) - || (possibleRect.right() > focusedRect.x() && possibleRect.right() < focusedRect.right()) - || (possibleRect.x() > focusedRect.x() && possibleRect.x() < focusedRect.right()) - || (possibleRect.x() > focusedRect.x() && possibleRect.right() < focusedRect.right()) - || (possibleRect.x() < focusedRect.x() && possibleRect.right() > focusedRect.right())) { - euclideanDist = 0; - distanceX = 0; - } else { - // displacement is added for being orthogonally far from the current rectangle. - if (possibleRect.x() > focusedRect.right()) - displacement = possibleRect.x() - focusedRect.right(); - if (possibleRect.right() < focusedRect.x()) - displacement = focusedRect.x() - possibleRect.right(); - - // This is a little sketchy, but if the rectangles are all - // touching set the displacment to 1 so rects on the same plane win - if (displacement == 0) - displacement = 1; - - // if the focus is within the view limit the diagonal search by half the search rectangle - if (searchRect.intersects(focusedRect) && (displacement > (searchRect.width()/2))) - return KMaxDistance; - - } - - } else if (direction == Qt::Key_Left || direction == Qt::Key_Right) { - - // if the rectangles are on the same plane set the euclideanDist to zero to favor this navigation - if ((possibleRect.y() == focusedRect.y()) - || (possibleRect.bottom() > focusedRect.y() && possibleRect.bottom() < focusedRect.bottom()) - || (possibleRect.y() > focusedRect.y() && possibleRect.y() < focusedRect.bottom()) - || (possibleRect.y() > focusedRect.y() && possibleRect.bottom() < focusedRect.bottom()) - || (possibleRect.y() < focusedRect.y() && possibleRect.bottom() > focusedRect.bottom())) { - euclideanDist = 0; - distanceY = 0; - } else { - // displacement is added for being orthogonally far from the current rectangle. - if (possibleRect.y() > focusedRect.bottom()) - displacement = possibleRect.y() - focusedRect.bottom(); - if (possibleRect.bottom() < focusedRect.y()) - displacement = focusedRect.y() - possibleRect.bottom(); - - // This is a little sketchy, but if the rectangles are all - // touching set the displacment to 1 so rects on the same plane win - if (displacement == 0) - displacement = 1; - - // if the focus is within the view limit the diagonal search by half the search rectangle - if (searchRect.intersects(focusedRect) && (displacement > (searchRect.height()/2))) - return KMaxDistance; - } - } - - return euclideanDist + distanceX + distanceY + 2 * (displacement); -} - - - -bool WebDirectionalNavigation::nextElementInDirection(int direction) -{ - double bestDistance = KMaxDistance; - QWebElement bestElement; -#if QT_VERSION < 0x040600 - QList<QWebElement> elementList = m_webPage->currentFrame()->findAllElements(QString("a,input,select,textarea,object")); -#else - QList<QWebElement> elementList = m_webPage->currentFrame()->findAllElements(QString("a,input,select,textarea,object")).toList(); -#endif - QList<QWebElement>::iterator it; - for (it = elementList.begin(); it != elementList.end(); it++) { - QWebElement el(*it); - QRect nRect(el.geometry()); - if (nRect.isValid()) { - if (QRect(m_webPage->currentFrame()->scrollPosition(),m_webPage->viewportSize()).intersects(nRect)) { - double distance = calculateElementDistance (direction, nRect); - if (bestDistance > distance) { - bestDistance = distance; - bestElement = el; - } - } - } - } - - if (!bestElement.isNull() && bestElement != m_webElement) { - m_webElement.setStyleProperty("outline", m_webElementStyle); - m_webElement = bestElement; - m_webElement.setFocus(); - m_webElementStyle = m_webElement.styleProperty("outline", QWebElement::ComputedStyle); - m_webElement.setStyleProperty("outline", "3px ridge rgb(140,140,255)"); - scrollFrame(direction); - return true; - } - - scrollFrameOneDirection (direction, KNormalScrollRange); - return false; -} - - -bool WebDirectionalNavigation::eventFilter(QObject *object, QEvent *event) -{ - if (object == m_view) { - switch (event->type()) { - case QEvent::KeyPress: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down - || ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right ) - { - return true; - } - if (ev->key() == Qt::Key_Select ) - { - QKeyEvent rockerEnterEvent(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier); - m_webPage->event(&rockerEnterEvent); - return true; - } - } - break; - case QEvent::KeyRelease: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down - || ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right ) - { - nextElementInDirection(ev->key()); - return true; - } - if (ev->key() == Qt::Key_Select ) - { - QKeyEvent rockerEnterEvent(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier); - m_webPage->event(&rockerEnterEvent); - return true; - } - } - break; - default: - return false; - break; - } // end of switch statement - } // end of if statement - return false; -} - - -void WebDirectionalNavigation::scrollFrame(int direction) -{ - - int xadjust = m_webPage->viewportSize().width()/5; - int yadjust = m_webPage->viewportSize().height()/5; - - switch (direction) { - case Qt::Key_Left: { - int distanceX = xadjust - m_webElement.geometry().x(); - if (distanceX > 0) - scrollCurrentFrame(-distanceX,0); - } - break; - case Qt::Key_Right: { - int distanceX = m_webElement.geometry().right() - m_webPage->viewportSize().width()-xadjust; - if (distanceX > 0) - scrollCurrentFrame(distanceX,0); - } - break; - case Qt::Key_Up: { - int distanceY = yadjust - m_webElement.geometry().y(); - if (distanceY > 0) - scrollCurrentFrame(0,-distanceY); - } - break; - case Qt::Key_Down: { - int distanceY = m_webElement.geometry().bottom() - m_webPage->viewportSize().height()-yadjust; - if (distanceY > 0) - scrollCurrentFrame(0,distanceY); - } - break; - } -} - -void WebDirectionalNavigation::scrollFrameOneDirection (int direction, int distance) -{ - int dx = 0; - int dy = 0; - - switch (direction) { - case Qt::Key_Up: { - dy = -distance; - } - break; - case Qt::Key_Down: { - dy = +distance; - } - break; - case Qt::Key_Left: { - dx = -distance; - } - break; - case Qt::Key_Right: { - dx = distance; - } - break; - default: - break; - } - - scrollCurrentFrame(dx, dy); -} - -void WebDirectionalNavigation::scrollCurrentFrame (int dx, int dy) -{ - QPoint scrollPosition = m_webPage->currentFrame()->scrollPosition(); - m_webPage->currentFrame()->scroll(dx, dy); - - /* emit pageScrollPositionZero singal if it's mainFrame scrolling or scroll to top*/ - if (m_webPage->currentFrame() == m_webPage->mainFrame()) { - if (scrollPosition.y() == 0 || m_webPage->currentFrame()->scrollPosition().y() == 0) { - emit pageScrollPositionZero(); - } - } -} - -void WebDirectionalNavigation::setCurrentFrameScrollPosition (QPoint& pos) -{ - QPoint scrollPosition = m_webPage->currentFrame()->scrollPosition(); - m_webPage->currentFrame()->setScrollPosition(pos); - - /* emit pageScrollPositionZero singal if it's mainFrame scrolling or scroll to top*/ - if (m_webPage->currentFrame() == m_webPage->mainFrame()) { - if (scrollPosition.y() == 0 || m_webPage->currentFrame()->scrollPosition().y() == 0) { - emit pageScrollPositionZero(); - } - } -} - -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webdirectionalnavigation.h --- a/browsercore/core/webdirectionalnavigation.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBDIRECTIONALNAVIGATION_H -#define WEBDIRECTIONALNAVIGATION_H - -#include <qobject.h> -#include <qevent.h> -#include <qvector.h> -#include <qpixmap.h> -#include <qwebelement.h> - -class QWebPage; - -namespace WRT { - - class WebDirectionalNavigation : public QObject - { - Q_OBJECT - public: - WebDirectionalNavigation(QWebPage* webPage,QObject* view); - virtual ~WebDirectionalNavigation(); - - void install(); - void uninstall(); - void setPage( QWebPage * page){ m_webPage = page ;} - - signals: - void pageScrollPositionZero(); - - protected: - bool eventFilter(QObject *object, QEvent *event); - void initiallayoutCompleted(); - double calculateElementDistance(int direction, const QRect& possibleRect); - bool nextElementInDirection(int direction); - void scrollFrame(int direction); - void scrollFrameOneDirection (int direction, int distance); - void scrollCurrentFrame (int dx, int dy); - void setCurrentFrameScrollPosition (QPoint& pos); - - protected: - QWebPage* m_webPage; - QObject* m_view; - QWebElement m_webElement; - QString m_webElementStyle; - QPoint m_focusPoint; - }; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webhtmltabbednavigation.cpp --- a/browsercore/core/webhtmltabbednavigation.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "webhtmltabbednavigation.h" -#include "qwebpage.h" -#include "qwebframe.h" -#include "qwebelement.h" -#include <QDebug> - -namespace WRT { - -/*! - \class WebHtmlTabIndexedNavigation - \since cwrt 1.0 - \brief cwrt navigation. - - \sa WebNavigation, WebTouchNavigation, WebCursorNavigation, WebDirectionalNavigation -*/ -WebHtmlTabIndexedNavigation::WebHtmlTabIndexedNavigation(QWebPage* webPage,QObject* view) : m_webPage(webPage) -, m_view(view) -, m_radioKeyPressed(Qt::Key_Down) -, m_radioGroupFocused(false) -{ - install(); -} - -/*! -*/ -WebHtmlTabIndexedNavigation::~WebHtmlTabIndexedNavigation() -{ - uninstall(); -} - -void WebHtmlTabIndexedNavigation::install() -{ - m_view->installEventFilter(this); -} - -void WebHtmlTabIndexedNavigation::uninstall() -{ - m_view->removeEventFilter(this); -} - -bool WebHtmlTabIndexedNavigation::eventFilter(QObject *object, QEvent *event) -{ - if (object == m_view) { - switch (event->type()) { - case QEvent::KeyPress: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - keyPressEvent(ev); - return ev->isAccepted(); - } - case QEvent::KeyRelease: { - QKeyEvent* ev = static_cast<QKeyEvent*>(event); - keyReleaseEvent(ev); - return ev->isAccepted(); - } - default: - break; - } - } - return false; -} - -/*! - If the key is directional up or left sends a tab key press with a shift modifier to QWebPage - If the key is directional right or down sends a tab key press with out a shift modifer to QWebPage - Otherwise sends the key press event to QWebPage -*/ -void WebHtmlTabIndexedNavigation::keyPressEvent(QKeyEvent* ev) -{ - switch (ev->key()) { - case Qt::Key_Up: - case Qt::Key_Left: { - QKeyEvent tabEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier); - m_webPage->event(&tabEvent); - } - break; - case Qt::Key_Down: - case Qt::Key_Right: { - QKeyEvent tabEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier); - m_webPage->event(&tabEvent); - } - break; - case Qt::Key_Return: - case Qt::Key_Enter: - case Qt::Key_Select: { - QWebElement webElement = m_webPage->mainFrame()->findFirstElement(":focus"); - QString attribute = webElement.attribute("type"); - if (attribute.toLower().compare("checkbox")==0) { - QKeyEvent spaceEvent(QEvent::KeyPress, Qt::Key_Space, Qt::NoModifier); - m_webPage->event(&spaceEvent); - } else if (attribute.toLower().compare("radio")==0) { - m_radioKeyPressed = (m_radioGroupFocused) ? Qt::Key_Down : Qt::Key_Up; - QKeyEvent keyevent(QEvent::KeyPress, m_radioKeyPressed, Qt::NoModifier); - m_webPage->event(&keyevent); - m_radioGroupFocused = (webElement.document().findFirst(":checked") != webElement) ? m_radioGroupFocused : !m_radioGroupFocused; - } else if (webElement.tagName().toLower().compare("select")==0) { - QKeyEvent keyevent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier); - m_webPage->event(&keyevent); - } - } - break; - default: - if (m_webPage) - m_webPage->event(ev); - break; - }; -} - -/*! - If the key is directional up or left sends a tab key release with a shift modifier to QWebPage - If the key is directional right or down sends a tab key release with out a shift modifer to QWebPage - Otherwise sends the key press event to QWebPage -*/ -void WebHtmlTabIndexedNavigation::keyReleaseEvent(QKeyEvent* ev) -{ - switch (ev->key()) { - case Qt::Key_Up: - case Qt::Key_Left: { - QKeyEvent tabEvent(QEvent::KeyRelease, Qt::Key_Tab, Qt::ShiftModifier); - m_webPage->event(&tabEvent); - } - break; - case Qt::Key_Down: - case Qt::Key_Right: { - QKeyEvent tabEvent(QEvent::KeyRelease, Qt::Key_Tab, Qt::NoModifier); - m_webPage->event(&tabEvent); - } - break; - case Qt::Key_Return: - case Qt::Key_Enter: - case Qt::Key_Select: { - QWebElement webElement = m_webPage->mainFrame()->findFirstElement(":focus"); - QString attribute = webElement.attribute("type"); - if (attribute.toLower().compare("checkbox")==0) { - QKeyEvent spaceEvent(QEvent::KeyRelease, Qt::Key_Space, Qt::NoModifier); - m_webPage->event(&spaceEvent); - } else if (attribute.toLower().compare("radio")==0 || attribute.toLower().compare("select")==0) { - QKeyEvent keyevent(QEvent::KeyRelease, m_radioKeyPressed, Qt::NoModifier); - m_webPage->event(&keyevent); - } else if (webElement.tagName().toLower().compare("select")==0) { - QKeyEvent keyevent(QEvent::KeyRelease, Qt::Key_Down, Qt::NoModifier); - m_webPage->event(&keyevent); - } - } - default: - if (m_webPage) - m_webPage->event(ev); - break; - }; -} - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webhtmltabbednavigation.h --- a/browsercore/core/webhtmltabbednavigation.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBHTMLTABBEDNAVIGATION_H -#define WEBHTMLTABBEDNAVIGATION_H - -#include <qobject.h> -#include <qevent.h> - -class QWebPage; -namespace WRT { - - class WebHtmlTabIndexedNavigation : public QObject - { - public: - WebHtmlTabIndexedNavigation(QWebPage* webPage,QObject* view); - virtual ~WebHtmlTabIndexedNavigation(); - - void install(); - void uninstall(); - void setPage( QWebPage * page){ m_webPage = page ;} - - protected: - bool eventFilter(QObject *object, QEvent *event); - void keyPressEvent(QKeyEvent* ev); - void keyReleaseEvent(QKeyEvent* ev); - - private: - QWebPage* m_webPage; - QObject* m_view; - int m_radioKeyPressed; - bool m_radioGroupFocused; - }; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webnavigation.cpp --- a/browsercore/core/webnavigation.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "webnavigation.h" -#include "qwebpage.h" -#include "qwebframe.h" -#include "webtouchnavigation.h" -#include "webcursornavigation.h" -#include "webhtmltabbednavigation.h" -#include "webdirectionalnavigation.h" - -namespace WRT { - -/*! - \class WebNavigation - \since cwrt 1.0 - \brief cwrt navigation. - - \sa WebTouchNavigation, WebCursorNavigation, WebDirectionalNavigation, WebHtmlTabIndexedNavigation -*/ -WebNavigation::WebNavigation(QWebPage* webPage,QObject* view) : m_webPage(webPage) -, m_view(view) -, m_webTouchNavigation(0) -, m_webCursorNavigation(0) -, m_webDirectionalNavigation(0) -, m_webHtmlTabIndexNavigation(0) -{ - m_webPage->settings()->setUserStyleSheetUrl(QUrl("data:text/css;charset=utf-8;base64," \ - + QByteArray("textarea:hover, textarea:focus { " \ - " outline: auto; " \ - " outline-style: solid; " \ - " outline-color: rgb(140,140,255); " \ - " outline-width: 2px; " \ - "} " \ - "select:hover, " \ - "select[multiple]:hover, " \ - "select:focus, " \ - "select[multiple]:focus { " \ - " outline: auto; " \ - " outline-style: solid; " \ - " outline-color: rgb(140,140,255); " \ - " outline-width: 2px; " \ - "} " \ - "input:hover, input:focus { " \ - " outline: auto; " \ - " outline-style: solid; " \ - " outline-color: rgb(140,140,255); " \ - " outline-width: 2px; " \ - "} " \ - "object:hover, object:focus { " \ - " outline: auto; " \ - " outline-style: solid; " \ - " outline-color: rgb(140,140,255); " \ - " outline-width: 2px; " \ - "} " \ - "input:disabled, select:disabled, textarea:disabled { " \ - " outline: none; " \ - "} " \ - "a:-webkit-any-link { " \ - " padding: 1px 2px; " \ - "} " \ - "a:-webkit-any-link:visited { " \ - " color: red; " \ - "} " \ - "a:-webkit-any-link:active { " \ - " background-color: lightgray; " \ - " -webkit-border-radius: 3px; " \ - " text-decoration: none; " \ - "} " \ - "a:-webkit-any-link:focus { " \ - " background-color: lightgray; " \ - " -webkit-border-radius: 3px; " \ - " text-decoration: none; " \ - "} ").toBase64())); - - - setNavigationMode(); - connect(m_webPage->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(setNavigationMode())); - connect(this, SIGNAL(longPressEvent()), m_webPage,SIGNAL(longPressEvent())); - connect(this,SIGNAL(focusElementChanged(wrtBrowserDefs::BrowserElementType &)), - m_webPage,SLOT(setElementType(wrtBrowserDefs::BrowserElementType &))); - connect(this, SIGNAL(pageScrollPositionZero()), m_webPage, SIGNAL(pageScrollPositionZero())); - -} - -/*! -*/ -WebNavigation::~WebNavigation() -{ - delete m_webTouchNavigation; - delete m_webCursorNavigation; - delete m_webDirectionalNavigation; - delete m_webHtmlTabIndexNavigation; -} - -void WebNavigation::setPage(QWebPage * page) { - - m_webPage = page; - if (m_webTouchNavigation) - m_webTouchNavigation->setPage(page); - if (m_webCursorNavigation) - m_webCursorNavigation->setPage(page); - if (m_webDirectionalNavigation) - m_webDirectionalNavigation->setPage(page); - if (m_webHtmlTabIndexNavigation) - m_webHtmlTabIndexNavigation->setPage(page); -} - -/*! - Sets the navigation mode -*/ -void WebNavigation::setNavigationMode() -{ - if (!m_webPage) - return; - - if (!m_view) - return; - - if (m_webTouchNavigation) - m_webTouchNavigation->uninstall(); - if (m_webCursorNavigation) - m_webCursorNavigation->uninstall(); - if (m_webDirectionalNavigation) - m_webDirectionalNavigation->uninstall(); - if (m_webHtmlTabIndexNavigation) - m_webHtmlTabIndexNavigation->uninstall(); - - QWebFrame* webFrame = m_webPage->currentFrame(); - if (webFrame) { - QMultiMap<QString, QString> map = webFrame->metaData(); - if (map.value("touchnavigation") != "off" && map.value("navigation") != "none") { - if (!m_webTouchNavigation) { - m_webTouchNavigation = new WebTouchNavigation(m_webPage,m_view); - connect( (const QObject*)(m_webTouchNavigation),SIGNAL(longPressEvent()),this,SIGNAL(longPressEvent())); - connect((const QObject*)(m_webTouchNavigation), SIGNAL(focusElementChanged(wrtBrowserDefs::BrowserElementType &)), - this, SIGNAL(focusElementChanged(wrtBrowserDefs::BrowserElementType &))); - connect( (const QObject*)(m_webTouchNavigation),SIGNAL(pageScrollPositionZero()),this,SIGNAL(pageScrollPositionZero())); - - } - else - m_webTouchNavigation->install(); - } - - // Enable key navigation, browser does not depend on meta data for navigation - if (!m_webDirectionalNavigation) { - m_webDirectionalNavigation = new WebDirectionalNavigation(m_webPage,m_view); - connect( (const QObject*)(m_webDirectionalNavigation),SIGNAL(pageScrollPositionZero()),this,SIGNAL(pageScrollPositionZero())); - } - else { - m_webDirectionalNavigation->install(); - } - } -} - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webnavigation.h --- a/browsercore/core/webnavigation.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBNAVIGATION_H -#define WEBNAVIGATION_H - -#include "brtglobal.h" - -#include <qobject.h> -#include "wrtBrowserDefs.h" - -class QWebPage; - -namespace WRT { - -class WebTouchNavigation; -class WebCursorNavigation; -class WebDirectionalNavigation; -class WebHtmlTabIndexedNavigation; - -class WRT_BROWSER_EXPORT WebNavigation : public QObject -{ -Q_OBJECT -public: - WebNavigation(QWebPage* webPage,QObject* view); - virtual ~WebNavigation(); - void setPage( QWebPage * page); - -public slots: - void setNavigationMode(); - -signals: - void longPressEvent();// mouse long press signal - void focusElementChanged(wrtBrowserDefs::BrowserElementType &); - void pageScrollPositionZero(); - -protected: - WebTouchNavigation* m_webTouchNavigation; - WebCursorNavigation* m_webCursorNavigation; - WebDirectionalNavigation* m_webDirectionalNavigation; - WebHtmlTabIndexedNavigation* m_webHtmlTabIndexNavigation; -private: - QWebPage* m_webPage; - QObject* m_view; -}; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webpagedata.h --- a/browsercore/core/webpagedata.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/webpagedata.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,29 +1,33 @@ /* * 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 __WEBPAGEDATA_H__ #define __WEBPAGEDATA_H__ #include <QImage> #include <QPoint> #include <QMetaType> +#include "BWFGlobal.h" -class WebPageData : public QObject +class BWF_EXPORT WebPageData : public QObject { Q_OBJECT public: diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webtouchnavigation.cpp --- a/browsercore/core/webtouchnavigation.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1288 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "webtouchnavigation.h" -#include "qwebpage.h" -#include "qwebframe.h" -#include "qapplication.h" -#include "qwebelement.h" -#include <QGraphicsSceneMouseEvent> -#include <QTimer> -#include <qmath.h> - -#include "webcontentview.h" -#include "wrtBrowserUtils.h" - - -#define LONG_PRESS_DURATION 500 - -const int KFlickSpeed = 400; -const qreal PI = 3.1415926535897932; -const qreal KAngleTolerance = 30; -const int KAnimationTimeout = 40; -const qreal KDecelerationFactor = 0.8; -const int KMilliSecond = 1000; -const int KThresholdForRightToLeftMotion = 100; // 100 pixels -const int KThresholdForLeftToRightMotion = -100; // 100 pixels -const int XAlignVal = 10; -const int KDecelerationTimer = 125; //Decelerate only if flicked/swiped after KDecelerationTimer milli seconds after last drag event -const int KDoubleClickTimeOut = 400; -const QPoint KFocussPoint(5, 50); -const int KTouchThresholdX = 20; -const int KTouchThresholdY = 20; -const int KThreshHoldValForLink = 10; -const qreal KDeccelaration = 1000.00; -const int KDefaultViewportWidth = 980; -const int KDefaultPortraitScaleWidth = 540; - -const int KKineticTimeout = 60; -const int KMinBlockWidth = 50; - -static const int KStartPanDistance = 50; -static const int KWaitForClickTimeoutMS = 200; -//The amount of pixels to try to pan before pan mode unlocks -static const int KPanModeChangeDelta = 100; - -namespace WRT { - -/*! - \class WebTouchNavigation - \since cwrt 1.0 - \brief cwrt navigation. - - \sa WebNavigation, WebHtmlTabIndexedNavigation, WebCursorNavigation, WebDirectionalNavigation -*/ -WebTouchNavigation::WebTouchNavigation(QWebPage* webPage,QObject* view) -: m_webPage(webPage) -, m_view(view) -, m_frame(0) -, m_scrollTimer(0) -, m_doubleClickTimer(0) -, m_pressEvent(0) -, m_releaseEvent(0) -, m_focusedBlockPt(-1, -1) -, m_ishighlighted(false) -, m_offset(0) -, m_longPressTimer(0) -, m_finalzoomfactor(0) -, m_kineticTimer(0) -, m_isPanning(false) -{ - install(); - WebContentWidget* currentView = qobject_cast<WebContentWidget*>(m_view); - connect(currentView, SIGNAL(BlockFocusChanged(QPoint)), this, SLOT(BlockFocusChanged(QPoint))); -} - -/*! -*/ -WebTouchNavigation::~WebTouchNavigation() -{ - disconnect(m_doubleClickTimer, SIGNAL(timeout()), this, SLOT(doubleClickTimerExpired())); - if (m_doubleClickTimer) { - m_doubleClickTimer->stop(); - delete m_doubleClickTimer; - } - disconnect(m_scrollTimer, SIGNAL(timeout()),this,SLOT(pan())); - delete m_scrollTimer; - - disconnect(m_kineticTimer, SIGNAL(timeout()),this,SLOT(kineticScroll())); - delete m_kineticTimer; - uninstall(); -} - -void WebTouchNavigation::install() -{ - m_view->installEventFilter(this); -} - -void WebTouchNavigation::BlockFocusChanged(QPoint pt) -{ - m_focusedBlockPt = pt; -} - -void WebTouchNavigation::uninstall() -{ - if (m_view) - m_view->removeEventFilter(this); -} - -bool WebTouchNavigation::eventFilter(QObject *object, QEvent *event) -{ - bool ret = false; - if (object != m_view) - return false; - -{ - switch (event->type()) { - case QEvent::MouseButtonPress: - if (static_cast<QMouseEvent *>(event)->buttons() & Qt::LeftButton) { - mousePressEvent(static_cast<QMouseEvent *>(event)->pos()); - return true; - } - break; - case QEvent::MouseMove: - if (static_cast<QMouseEvent *>(event)->buttons() & Qt::LeftButton) { - mouseMoveEvent(static_cast<QMouseEvent*>(event)->pos()); - return true; - } - break; - case QEvent::MouseButtonRelease: - mouseReleaseEvent(static_cast<QMouseEvent*>(event)->pos()); - return true; - case QEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast<QMouseEvent*>(event)->pos()); - return true; - case QEvent::GraphicsSceneMousePress: - if (static_cast<QGraphicsSceneMouseEvent*>(event)->buttons() & Qt::LeftButton) { - mousePressEvent(static_cast<QGraphicsSceneMouseEvent*>(event)->pos().toPoint()); - return true; - } - break; - case QEvent::GraphicsSceneMouseMove: - if (static_cast<QGraphicsSceneMouseEvent *>(event)->buttons() & Qt::LeftButton) { - mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(event)->pos().toPoint()); - return true; - } - break; - case QEvent::GraphicsSceneMouseRelease: { - mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(event)->pos().toPoint()); - return true; - } - break; - case QEvent::GraphicsSceneMouseDoubleClick: - mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(event)->pos().toPoint()); - return true; - break; - default: - break; - } - } - return false; -} - -void WebTouchNavigation::stopScrolling() -{ - if (m_scrollTimer && m_scrollTimer->isActive()) { - m_scrollTimer->stop(); - m_scrollDelta = QPoint(0,0); - } - - if (m_kineticTimer && m_kineticTimer->isActive()) { - m_kineticTimer->stop(); - m_kineticSpeed.setX(0.0); - m_kineticSpeed.setY(0.0); - } -} - - -void WebTouchNavigation::pan() -{ - if (m_scrollDelta.x() != 0 || m_scrollDelta.y() != 0) { - scrollCurrentFrame(-m_scrollDelta.x(), m_scrollDelta.y()); - m_scrollDelta = QPoint(0,0); - } -} - -#define DECELERATION 0.0002 - -void WebTouchNavigation::kineticScroll() -{ - qreal decelX = m_kineticSpeed.x() > 0 ? -DECELERATION : DECELERATION; - qreal decelY = m_kineticSpeed.y() > 0 ? -DECELERATION : DECELERATION; - qreal dx = 0; - qreal dy = 0; - qreal vx = 0; - qreal vy = 0; - - m_kineticScrollTime += m_actualTime.elapsed(); - - if (m_kineticSpeed.x()) { - vx = m_kineticSpeed.x() + decelX * m_kineticScrollTime; - if (vx * m_kineticSpeed.x() < 0) { - dx = 0; - vx = 0; - } - else { - dx = m_kineticScrollTime * m_kineticSpeed.x() + - 0.5 * decelX * m_kineticScrollTime * m_kineticScrollTime; - } - } - - if (m_kineticSpeed.y()) { - vy = m_kineticSpeed.y() + decelY * m_kineticScrollTime; - if (vy * m_kineticSpeed.y() < 0) { - dy = 0; - vy = 0; - } - else { - dy = m_kineticScrollTime * m_kineticSpeed.y() + - 0.5 * decelY * m_kineticScrollTime * m_kineticScrollTime; - } - } - - QPoint scrollPos = m_frame->scrollPosition(); - QPoint distPos = m_initialScrollPos + QPointF(dx, dy).toPoint(); - - - - if (vx != 0 || vy != 0) { - setCurrentFrameScrollPosition(distPos); - } - - if ((vx == 0 && vy == 0) || scrollPos == m_frame->scrollPosition()) { - stopScrolling(); - } - -} - - - -/*! - Scrolls QWebFrame to the given position - \sa QWebFrame::scroll() -*/ -void WebTouchNavigation::scrollFrame(const QPoint& pos) -{ - if (m_touchPosition != pos) { - QPoint diff = m_touchPosition-pos; - if (qAbs(diff.x()) < 10 && qAbs(diff.y()) < 10) - return; - else if(m_dragPoints.size() == 1) { - WebContentWidget* view = qobject_cast<WebContentWidget*>(m_view); - view->setBlockElement(QWebElement()); - } - - if(!m_isPanning) { - qreal dy = qAbs(diff.y()); - qreal dx = qAbs(diff.x()); - if (dy > KStartPanDistance || dx > KStartPanDistance - || m_delayedPressMoment.elapsed() > KWaitForClickTimeoutMS) { - //get the scroll direction - Direction scrollDir = findDirectionWithAngle(m_touchPosition,pos); - if(scrollDir == UP || scrollDir == DOWN) - startPanGesture(VerticalPan); - else if(scrollDir == LEFT || scrollDir == RIGHT) - startPanGesture(HorizontalPan); - else - startPanGesture(RandomPan); - m_isPanning = true; - m_dragStartPos = pos; - } - } - - if (m_isPanning) { - m_scrolled= false; - m_frame = getNextScrollableFrame(diff); - QPoint scrollPosition = m_frame->scrollPosition(); - if (diff.manhattanLength()) - panBy(diff); - - m_scrolled = (scrollPosition != m_frame->scrollPosition()); - m_dragStartPos = pos; - } - - m_touchPosition = pos; - DragPoint dragPoint; - dragPoint.iPoint = pos; - dragPoint.iTime = QTime::currentTime(); - m_dragPoints.append(dragPoint); - - QTime now(QTime::currentTime()); - m_lastMoveEventTime.setHMS(now.hour(),now.minute(), now.second(), now.msec()); - - while (m_dragPoints.size() > 4) - m_dragPoints.removeFirst(); - } -} - -void WebTouchNavigation::startPanGesture(PanDirection directionHint) { - m_panDirection = directionHint; - m_panModeResidue = QPointF(0., 0.); -} -void WebTouchNavigation::panBy(const QPointF& delta) { - - m_panModeResidue += delta; - - if (qAbs(m_panModeResidue.x()) > KPanModeChangeDelta) - m_panDirection = HorizontalPan; - - if (qAbs(m_panModeResidue.y()) > KPanModeChangeDelta) - m_panDirection = VerticalPan; - - if(qAbs(m_panModeResidue.x()) > KPanModeChangeDelta - && qAbs(m_panModeResidue.y()) > KPanModeChangeDelta) - m_panDirection = RandomPan; - - QPointF p; - if(m_panDirection == HorizontalPan) - p.setX(delta.x()); - if(m_panDirection == VerticalPan) - p.setY(delta.y()); - if(m_panDirection == RandomPan) { - p.setX(delta.x()); - p.setY(delta.y()); - } - - scrollCurrentFrame(p.x(),p.y()); -} - -void WebTouchNavigation::highlightableElement(QMouseEvent* ev) { - m_anchorElement = getClosestAnchorElement(ev); -} - -inline int xInRect(const QRect& r, int x) -{ - return std::min(std::max(x, r.x()), r.x() + r.width()); -} - -inline int yInRect(const QRect& r, int y) -{ - return std::min(std::max(y, r.y()), r.y() + r.height()); -} - -bool WebTouchNavigation::traverseNextNode(QWebElement parentNode,QWebElement& nextNode) -{ - if (!parentNode.firstChild().isNull()) { - nextNode = parentNode.firstChild(); - return true; - } - - if (!parentNode.nextSibling().isNull()) { - nextNode = parentNode.nextSibling(); - return true; - } - - QWebElement n = parentNode; - while (!n.isNull() && n.nextSibling().isNull()) - n = n.parent (); - - if (!n.isNull()) { - nextNode = n.nextSibling(); - return true; - } - - return false; -} - - -QWebElement WebTouchNavigation::getClosestAnchorElement(QMouseEvent* ev) -{ - QWebElement webElement; - QWebHitTestResult htRes = getHitTestResult(ev); - QWebElement hitElement = htRes.element(); - //check whether hit test returns a link element - if(!htRes.linkElement().isNull()) { - webElement = htRes.linkElement(); - m_higlightedPos = ev->pos(); - m_ishighlighted = true; - } - //get the closet anchor element - else { - QPoint docPoint = (m_touchPosition + m_frame->scrollPosition()); - int dist = 99999999; - QWebElement result; - QWebElement ele = m_webPage->currentFrame()->documentElement(); - do { - if(ele.tagName().compare("a",Qt::CaseInsensitive) == 0 ) { - QRect r = ele.geometry(); - if(r.contains(docPoint)) { - dist = 0; - result = ele; - break; - } - - int x = xInRect(r, docPoint.x()); - int y = yInRect(r, docPoint.y()); - int d = (docPoint.x() - x) * (docPoint.x() - x) + (docPoint.y() - y) * (docPoint.y() - y); - if (dist > d) { - dist = d; - result = ele; - } - } - }while(traverseNextNode(ele,ele)); - - WebContentWidget* view = qobject_cast<WebContentWidget*>(m_view); - // check if we are close enough and calcualte with zoom factor. - if (dist< (KThreshHoldValForLink/view->zoomFactor())) { - QRect r = result.geometry(); - r.translate(2,2); - r.setWidth(2+2); - r.setHeight(2+2); - webElement = result; - m_higlightedPos = QPoint(xInRect(r, docPoint.x()), yInRect(r, docPoint.y())) - m_frame->scrollPosition(); - m_ishighlighted = true; - QPoint centerpt = webElement.geometry().center(); - m_offset = (docPoint.x()- centerpt.x())*(docPoint.x()- centerpt.x()) + (docPoint.y()- centerpt.y())*(docPoint.y()- centerpt.y()); - - } - } - return webElement; -} - -/*! - Sends a mouse press event to QWebPage -*/ -void WebTouchNavigation::mousePressEvent(const QPoint& pos) -{ - m_delayedPressMoment.start(); - // stop deceleration and don't send further events to engine if scroll timer is active - if(m_scrollTimer && m_scrollTimer->isActive()) { - m_prevPoint.setX(0); - m_prevPoint.setY(0); - m_scrollDistance.setX(0); - m_scrollDistance.setY(0); - - m_lastMoveEventTime.setHMS(0,0,0,0); //H, M, S, mS - m_scrolled = false; - m_ishighlighted = false; - m_higlightedPos = m_touchPosition = pos; - m_frame = m_webPage->frameAt(pos); - if (!m_frame) - m_frame = m_webPage->currentFrame(); - - m_dragPoints.clear(); - - DragPoint dragPoint; - dragPoint.iPoint = m_touchPosition; - dragPoint.iTime = QTime::currentTime(); - m_dragPoints.append(dragPoint); - m_offset = 0; - - m_pressEvent = new QMouseEvent(QEvent::MouseButtonPress, m_touchPosition, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - m_scrollTimer->stop(); - return; - } - - if (m_doubleClickTimer) { - // If there is another click event almost on the same region - // as the previous click before doubleClick timeout - // Consider it as double click. - if (m_doubleClickTimer->isActive() && m_pressEvent) { - QPoint diff = m_pressEvent->pos() - pos; - if (qAbs(diff.x()) < KTouchThresholdX && qAbs(diff.y()) < KTouchThresholdY) { - mouseDoubleClickEvent(pos); - return; - } - } - m_doubleClickTimer->stop(); - } else { - m_doubleClickTimer = new QTimer(this); - connect(m_doubleClickTimer, SIGNAL(timeout()), this, SLOT(doubleClickTimerExpired())); - } - - //Clear the previous press and release events. - if (m_pressEvent) { - delete m_pressEvent; - m_pressEvent = NULL; - } - - if (m_releaseEvent) { - delete m_releaseEvent; - m_releaseEvent = NULL; - } - - m_doubleClickTimer->start(KDoubleClickTimeOut); - m_pressEvent = new QMouseEvent(QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); -} - -void WebTouchNavigation::handleMousePressEvent(QMouseEvent* ev) -{ - m_lastMoveEventTime.setHMS(0,0,0,0); //H, M, S, mS - if(!m_longPressTimer){ - delete m_longPressTimer; - m_longPressTimer = 0; - } - startTimer(); - m_scrolled = false; - m_ishighlighted = false; - m_higlightedPos = m_touchPosition = ev->pos(); - m_frame = m_webPage->frameAt(ev->pos()); - if (!m_frame) - m_frame = m_webPage->currentFrame(); - - m_dragPoints.clear(); - - DragPoint dragPoint; - dragPoint.iPoint = m_touchPosition; - dragPoint.iTime = QTime::currentTime(); - m_dragPoints.append(dragPoint); - - m_offset = 0; - - highlightableElement(ev); - getFocusedElement(); - - //send a mouse press - QMouseEvent iev(ev->type(), m_touchPosition, ev->button(), ev->buttons(), ev->modifiers()); - m_webPage->event(&iev); -} - -void WebTouchNavigation::doubleClickTimerExpired() -{ - handleMousePressEvent(m_pressEvent); - - delete m_pressEvent; - m_pressEvent = NULL; - - if (m_releaseEvent) { - handleMouseReleaseEvent(m_releaseEvent); - - //clear release event - delete m_releaseEvent; - m_releaseEvent = NULL; - } - if (m_doubleClickTimer && m_doubleClickTimer->isActive()) - m_doubleClickTimer->stop(); -} - -bool WebTouchNavigation::canDehighlight(QMouseEvent* ev) - { - bool checkDehighlight = false; - QPoint pt = ev->pos() + m_frame->scrollPosition(); - - if(m_scrolled && m_ishighlighted) { - checkDehighlight = true; - } - else if(!m_scrolled && m_ishighlighted) { - QRect rect = m_anchorElement.geometry(); - - if(m_anchorElement.geometry().contains(pt)) { - checkDehighlight = false; - } - else if(m_offset){ - QPoint centerpt = m_anchorElement.geometry().center(); - int newoffset = (pt.x()- centerpt.x())*(pt.x()- centerpt.x()) + (pt.y()- centerpt.y())*(pt.y()- centerpt.y()); - - if(newoffset <= m_offset ) { - m_offset = newoffset; - checkDehighlight = false; - } - else { - m_offset =0; - checkDehighlight = true; - } - } - else { - checkDehighlight = true; - } - } - return checkDehighlight; -} - void WebTouchNavigation::dehighlight(QMouseEvent* ev) -{ - m_higlightedPos = QPoint(0,0); - m_ishighlighted = false; - QMouseEvent iev(QEvent::MouseButtonPress,m_higlightedPos,ev->button(), ev->buttons(), ev->modifiers()); - m_webPage->event(&iev); -} - -void WebTouchNavigation::handleHighlightChange(QMouseEvent* ev) -{ - if (!canDehighlight(ev)) return; - - dehighlight(ev); -} - -/*! - Scrolls the frame - \sa scrollFrame() -*/ -void WebTouchNavigation::mouseMoveEvent(const QPoint& pos) -{ - if (m_pressEvent) { - QPoint diff = m_pressEvent->pos() - pos; - if (qAbs(diff.x()) < KTouchThresholdX && qAbs(diff.y()) < KTouchThresholdY) - return; - } - - if (m_doubleClickTimer && m_doubleClickTimer->isActive()) { - //send mousePressEvent - m_doubleClickTimer->stop(); - handleMousePressEvent(m_pressEvent); - delete m_pressEvent; - m_pressEvent = NULL; - } - - stopTimer(); - QMouseEvent tmpEv(QEvent::MouseMove, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - handleHighlightChange(&tmpEv); - - scrollFrame(pos); -} - -/*! - If WebCanvas or QWebFrame were scrolled starts the deceleration alogrithm - Otherwise sends the mouse release event to QWebPage - \sa startDeceleration() -*/ -void WebTouchNavigation::mouseReleaseEvent(const QPoint& pos) -{ - if(m_isPanning) - m_isPanning = false; - if (m_doubleClickTimer && m_doubleClickTimer->isActive()) { - m_releaseEvent = new QMouseEvent(QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - return; - } - //mouseReleaseEvent is called in two cases. 1. Double click, 2. Mouse Drag - //m_releaseEvent is not null only in Mouse double click - //So delete m_releaseEvent only in double click case. - //Send release event in mouse move case - if (m_releaseEvent) { - delete m_releaseEvent ; - m_releaseEvent = NULL; - } else { - QMouseEvent tmpEv(QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - handleMouseReleaseEvent(&tmpEv); - } -} - -void WebTouchNavigation::handleMouseReleaseEvent(QMouseEvent* ev) -{ - m_frame = m_webPage->frameAt(ev->pos()); - if (!m_frame) - m_frame = m_webPage->currentFrame(); - assert(m_frame); - - stopTimer(); - if (m_scrolled) { - int msecs = 0; - if (!m_lastMoveEventTime.isNull()) { - //Start deceleration only if the delta since last drag event is less than threshold - QTime now(QTime::currentTime()); - msecs = m_lastMoveEventTime.msecsTo(now); - m_lastMoveEventTime.setHMS(0,0,0,0); - } - if (msecs < KDecelerationTimer) { - if( isFlick()) { - updateFlickScrollDistance(); - } - else { - QRect enclosingRect = findEnclosingBlock(ev); - QPoint blockDocPt(enclosingRect.x(), enclosingRect.y()); - QPoint blockCanvasPoint(blockDocPt - m_frame->scrollPosition()); - calculateActualScrollDistance(); - int thresholdCheckVal = blockCanvasPoint.x() - m_actualScrollDistance.x(); - setNewScrollDistance(blockCanvasPoint, thresholdCheckVal); - } - startScrollTimer(); - } - } else { - Qt::KeyboardModifier modifier = Qt::NoModifier; - QWebHitTestResult htr = m_frame->hitTestContent(ev->pos()); - if (htr.element().tagName().toLower().compare("select")==0 && htr.element().hasAttribute("multiple")) - modifier = Qt::ControlModifier; - - //send a mouse press - if(m_ishighlighted) { - QMouseEvent iev(ev->type(), m_higlightedPos, ev->button(), ev->buttons(), ev->modifiers()); - m_webPage->event(&iev); - } - else { - QMouseEvent ievr(QEvent::MouseButtonRelease, m_touchPosition, ev->button(), ev->buttons(), modifier); - m_webPage->event(&ievr); - } -#if defined CWRTINTERNALWEBKIT && __SYMBIAN32__ -// FIXME Remove this, it is fixed Qt 4.6 - if (ev->button() == Qt::LeftButton) { - QWebHitTestResult htr = m_frame->hitTestContent(ev->pos()); - if (htr.isContentEditable()) { - QEvent vkbEvent(QEvent::RequestSoftwareInputPanel); - QApplication::sendEvent(m_view, &vkbEvent); - } - } -#endif - } -} - -void WebTouchNavigation::mouseDoubleClickEvent(const QPoint& pos) -{ - - if(m_doubleClickTimer && !m_doubleClickTimer->isActive()) - return; - else if(m_doubleClickTimer) - m_doubleClickTimer->stop(); - - //If the page is already scrolling(because of a previous doubletap) - //we need to stop the timer before we start scrolling the new block again. - if (m_scrollTimer && m_scrollTimer->isActive()) - m_scrollTimer->stop(); - - QMouseEvent tmpEv(QEvent::MouseButtonDblClick, pos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - handleDoubleClickEvent(&tmpEv); -} - -void WebTouchNavigation::handleDoubleClickEvent(QMouseEvent* ev) -{ - QPoint imageFocusPoint; - QWebHitTestResult hitTest = getHitTestResult(ev); - - QWebElement block = hitTest.element(); - - if (block.tagName() != "IMG" && (block.styleProperty(QString("background-image"),QWebElement::InlineStyle) == "")) - block = hitTest.enclosingBlockElement(); - - while (!block.isNull() && block.geometry().width() < KMinBlockWidth) { - block = block.parent(); - } - if(block.isNull()) - return; - - QWebFrame* frame = m_webPage->frameAt(ev->pos()); - m_frame = (frame) ? frame : m_webPage->mainFrame(); - - QRect enclosingRect = block.geometry(); - - QPoint blockCanvasPt = QPoint(enclosingRect.topLeft()) - m_frame->scrollPosition(); - WebContentWidget* view = qobject_cast<WebContentWidget*>(m_view); - view->setBlockElement(QWebElement()); - if(m_focusedBlockPt == blockCanvasPt) { - m_focusedBlockPt.setX(-1); - m_focusedBlockPt.setY(-1); - qreal m_Ratiox = (qreal) blockCanvasPt.x() / block.geometry().width(); - qreal m_Ratioy = (qreal) blockCanvasPt.y() / block.geometry().height(); - view->setZoomFactor(view->initialScale()); - QPoint m_InfocusBlockPt = QPoint(block.geometry().topLeft()) - m_webPage->mainFrame()->scrollPosition(); - m_webPage->currentFrame()->scroll(m_InfocusBlockPt.x() - (m_Ratiox * block.geometry().width()), - m_InfocusBlockPt.y() - (m_Ratioy * block.geometry().height())); - m_finalzoomfactor = 0; - }else { - if(block.tagName() != "IMG" && (block.styleProperty(QString("background-image"),QWebElement::InlineStyle) == "")) { - m_finalzoomfactor = (qreal) (m_webPage->viewportSize().width() - 10) * view->zoomFactor(); - m_finalzoomfactor = (qreal) m_finalzoomfactor / (enclosingRect.width()); - QString str; - str.setNum(m_finalzoomfactor,'f',2); - m_finalzoomfactor = str.toDouble(); - }else { - qreal factor; - factor = 1/view->initialScale(); - int boundW = block.geometry().width() * factor/view->zoomFactor(); - int boundH = block.geometry().height() * factor/view->zoomFactor(); - qreal factorw = 0.0,factorh = 0.0 ; - - if( boundW > m_webPage->viewportSize().width()) - factorw = (qreal)(m_webPage->viewportSize().width()-5)/ block.geometry().width(); - - if(boundH > m_webPage->viewportSize().height()) - factorh = (qreal)(m_webPage->viewportSize().height()-5)/ block.geometry().height(); - - if( (factorw == 0.0) && (factorh == 0.0)) - ; - else if(factorw == 0.0) - factor = factorh * view->zoomFactor(); - else if(factorh == 0.0) - factor = factorw * view->zoomFactor(); - else { - factor = ((factorh < factorw) ? factorh : factorw) * view->zoomFactor(); - } - - QString str; - str.setNum(factor,'f',2); - factor = str.toDouble(); - - if(m_finalzoomfactor != factor) - m_finalzoomfactor = factor; - } - - - if (m_finalzoomfactor != view->zoomFactor()) { - view->setZoomFactor(m_finalzoomfactor); - m_focusedBlockPt = QPoint(block.geometry().topLeft()) - m_frame->scrollPosition(); - - if(block.tagName() != "IMG" && (block.styleProperty(QString("background-image"),QWebElement::InlineStyle) == "")) - scrollCurrentFrame(m_focusedBlockPt.x() - KFocussPoint.x() , m_focusedBlockPt.y() - KFocussPoint.y()); - else { - if((m_webPage->viewportSize().width() - block.geometry().width()) > 0) - imageFocusPoint.setX((m_webPage->viewportSize().width() - block.geometry().width())/2); - else - imageFocusPoint.setX(0); - - if((m_webPage->viewportSize().height() - block.geometry().height()) > 0) - imageFocusPoint.setY((m_webPage->viewportSize().height() - block.geometry().height())/2); - else - imageFocusPoint.setY(0); - - scrollCurrentFrame(m_focusedBlockPt.x() - imageFocusPoint.x() , m_focusedBlockPt.y() - imageFocusPoint.y()); - } - - m_focusedBlockPt = QPoint(block.geometry().topLeft()) - m_frame->scrollPosition(); - } else { - //Get doc size and current bottom right view corner point in document - QSize viewSize = m_webPage->viewportSize(); - QSize contentSize = m_frame->contentsSize(); - QPoint documentViewPoint = QPoint(viewSize.width(),viewSize.height()) + m_frame->scrollPosition(); - QPoint docFocusPoint; - - if(block.tagName() != "IMG" && (block.styleProperty(QString("background-image"),QWebElement::InlineStyle) == "")) - docFocusPoint = KFocussPoint + m_frame->scrollPosition(); - else { - if((m_webPage->viewportSize().width() - block.geometry().width()) > 0) - imageFocusPoint.setX((m_webPage->viewportSize().width() - block.geometry().width())/2); - else - imageFocusPoint.setX(0); - - if((m_webPage->viewportSize().height() - block.geometry().height()) > 0) - imageFocusPoint.setY((m_webPage->viewportSize().height()- block.geometry().height())/2); - else - imageFocusPoint.setY(0); - - docFocusPoint = imageFocusPoint + m_frame->scrollPosition(); - } - - m_focusedBlockPt = QPoint(block.geometry().x(), block.geometry().y()); - m_scrollDistance.setX(m_focusedBlockPt.x() - docFocusPoint.x()); - m_scrollDistance.setY(m_focusedBlockPt.y() - docFocusPoint.y()); - - QPoint scrollableDistance(0, 0); - QPoint viewStartPoint = QPoint(0,0) + m_frame->scrollPosition(); - - if(m_scrollDistance.x() < 0) - scrollableDistance.setX(viewStartPoint.x()); - else - scrollableDistance.setX(contentSize.width() - documentViewPoint.x()); - - - if(m_scrollDistance.y() < 0) - scrollableDistance.setY(viewStartPoint.y()); - else - scrollableDistance.setY(contentSize.height() - documentViewPoint.y()); - - if(abs(m_scrollDistance.x()) > abs(scrollableDistance.x())){ - //m_scrollDistance.x() >= 0 means scroll from right to left - if(m_scrollDistance.x() >= 0) - m_focusedBlockPt.setX(m_focusedBlockPt.x() - abs(scrollableDistance.x())); - //m_scrollDistance.x() < 0 means scroll from left to right - else - m_focusedBlockPt.setX(m_focusedBlockPt.x() + abs(scrollableDistance.x())); - } else - m_focusedBlockPt.setX(docFocusPoint.x()); - - if (abs(m_scrollDistance.y()) > abs(scrollableDistance.y())){ - if(m_scrollDistance.y() >= 0) - m_focusedBlockPt.setY(m_focusedBlockPt.y() - abs(scrollableDistance.y())); - else - m_focusedBlockPt.setY(m_focusedBlockPt.y() + abs(scrollableDistance.y())); - } - else - m_focusedBlockPt.setY(docFocusPoint.y()); - - m_focusedBlockPt = m_focusedBlockPt - m_frame->scrollPosition(); - startScrollTimer(); - } - view->setBlockElement(block); - } -} - -/*! - Returns the next scrollable frame in the frame tree give the x,y position -*/ -QWebFrame* WebTouchNavigation::getNextScrollableFrame(const QPoint& pos) -{ - QWebFrame* frame = m_frame; - while (frame) { - if (pos.x() > 0) { - if (frame->scrollBarValue(Qt::Horizontal) < frame->scrollBarMaximum(Qt::Horizontal)) - break; - } - else if (pos.x() < 0) { - if (frame->scrollBarValue(Qt::Horizontal) > frame->scrollBarMinimum(Qt::Horizontal)) - break; - } - - if (pos.y() > 0) { - if (frame->scrollBarValue(Qt::Vertical) < frame->scrollBarMaximum(Qt::Vertical)) - break; - } - else if (pos.y() < 0) { - if (frame->scrollBarValue(Qt::Vertical) > frame->scrollBarMinimum(Qt::Vertical)) - break; - } - frame = frame->parentFrame(); - } - return (frame)?frame:m_webPage->mainFrame(); -} - -/* -Starts the timer for scrolling smoothly to the destination location . -The timer will do the decelaration while scrolling -*/ -void WebTouchNavigation::startScrollTimer() -{ - if(!m_scrollTimer) { - m_scrollTimer = new QTimer(this); - connect(m_scrollTimer,SIGNAL(timeout()),this,SLOT(scrollToEdge())); - } - m_scrollTimer->stop(); - m_scrollTimer->start(KAnimationTimeout); -} - -/* -Update the scroll distance for flick gesture. Update the scroll distance upto the edge of the page -*/ -void WebTouchNavigation::updateFlickScrollDistance() -{ - m_initialSpeed = speed(); - m_initialSpeed.setX(qAbs(m_initialSpeed.x())); - m_initialSpeed.setY(qAbs(m_initialSpeed.y())); - m_flickDirection = findDirectionWithAngle(m_dragPoints.first().iPoint,m_dragPoints.last().iPoint); - m_scrollDistance.setX((m_initialSpeed.x() * m_initialSpeed.x())/( 2 * KDeccelaration)); - m_scrollDistance.setY((m_initialSpeed.y() * m_initialSpeed.y())/( 2 * KDeccelaration)); - - WebContentWidget* view = qobject_cast<WebContentWidget*>(m_view); - m_scrollDistance.setX(view->zoomFactor() * m_scrollDistance.x() / view->initialScale()); - m_scrollDistance.setY(view->zoomFactor() * m_scrollDistance.y() / view->initialScale()); - - QSize viewSize = m_webPage->viewportSize(); - QSize contentSize = m_frame->contentsSize(); - QPoint documentViewPoint = QPoint(viewSize.width(),viewSize.height()) + m_frame->scrollPosition(); - QPoint documentTouchPoint = m_touchPosition + m_frame->scrollPosition();; - - switch(m_flickDirection) - { - case DOWN : - m_scrollDistance.setX(0); - m_scrollDistance.setY(-(m_scrollDistance.y())); - - if(m_scrollDistance.y() < -(documentTouchPoint.y() - m_touchPosition.y())) - m_scrollDistance.setY(-(documentTouchPoint.y() - m_touchPosition.y())); - break; - case UP : - m_scrollDistance.setX(0); - if(m_scrollDistance.y() > (contentSize.height() - documentViewPoint.y())) - m_scrollDistance.setY(contentSize.height() - documentViewPoint.y()); - break; - case RIGHT: - m_scrollDistance.setX(-(m_scrollDistance.x())); - if(m_scrollDistance.x() < -(documentTouchPoint.x() - m_touchPosition.x())) - m_scrollDistance.setX(-(documentTouchPoint.x() - m_touchPosition.x())); - m_scrollDistance.setY(0); - break; - case LEFT: - m_scrollDistance.setY(0); - if(m_scrollDistance.x() > (contentSize.width() - documentViewPoint.x())) - m_scrollDistance.setX(contentSize.width() - documentViewPoint.x()); - break; - case BOTTOMRIGHT: - m_scrollDistance.setX(-(m_scrollDistance.x())); - m_scrollDistance.setY(-(m_scrollDistance.y())); - if(m_scrollDistance.x() < -(documentTouchPoint.x()-m_touchPosition.x())) - m_scrollDistance.setX(-(documentTouchPoint.x()-m_touchPosition.x())); - if(m_scrollDistance.y() < -((documentTouchPoint.y()-m_touchPosition.y())/2)) - m_scrollDistance.setY(-((documentTouchPoint.y()-m_touchPosition.y())/2)); - break; - case BOTTOMLEFT: - m_scrollDistance.setY(-(m_scrollDistance.y())); - if(m_scrollDistance.x() > contentSize.width()-documentViewPoint.x()) - m_scrollDistance.setX(contentSize.width()-documentViewPoint.x()); - if(m_scrollDistance.y() < (-((documentTouchPoint.y()-m_touchPosition.y())/2))) - m_scrollDistance.setY(-((documentTouchPoint.y()-m_touchPosition.y())/2)); - break; - case TOPLEFT: - if(m_scrollDistance.x() > (contentSize.width()-documentViewPoint.x())) - m_scrollDistance.setX(contentSize.width()-documentViewPoint.x()); - if(m_scrollDistance.y() > ((contentSize.height()-documentViewPoint.y())/2)) - m_scrollDistance.setY((contentSize.height()-documentViewPoint.y())/2); - break; - case TOPRIGHT: - m_scrollDistance.setX(-(m_scrollDistance.x())); - if(m_scrollDistance.x() < (-(documentTouchPoint.x()-m_touchPosition.x()))) - m_scrollDistance.setX(-(documentTouchPoint.x()-m_touchPosition.x())); - if(m_scrollDistance.y() > ((contentSize.height()-documentViewPoint.y())/2)) - m_scrollDistance.setY((contentSize.height()-documentViewPoint.y())/2); - break; - } -} - -/* -Distinguishes b/w swipe and flick -*/ -bool WebTouchNavigation::isFlick() -{ - bool flick = false; - QPoint moveSpeed = speed(); - int xSpeed = moveSpeed.x(); - int ySpeed = moveSpeed.y(); - - flick = (qAbs(xSpeed) > KFlickSpeed || - qAbs(ySpeed) > KFlickSpeed); - - return flick; -} - -/* -Calculates the speed of te scroll along x-axis and y-axis -*/ -QPoint WebTouchNavigation::speed() -{ - // Speed is only evaluated at the end of the swipe - QPoint dragSpeed(0,0); - qreal time = dragTime() / KMilliSecond; - if (time > 0) { - QPoint distance = currentPos() - previousPos(); - dragSpeed.setX((distance.x()) / time); - dragSpeed.setY((distance.y()) / time); - } - return dragSpeed; -} - -/* -Returns the last point in the m_dragPoints list -*/ -QPoint WebTouchNavigation::currentPos() -{ - return m_dragPoints[m_dragPoints.size()-1].iPoint; -} - -/* -Returns the first point in the m_dragPoints list -*/ -QPoint WebTouchNavigation::previousPos() -{ - return m_dragPoints[0].iPoint; -} - -/* -Finds the time difference b/w the first and last dragpoint -*/ -qreal WebTouchNavigation::dragTime() const -{ - if(m_dragPoints.isEmpty()) - return 0.0; - else - return m_dragPoints[0].iTime.msecsTo(m_dragPoints[m_dragPoints.size()-1].iTime); -} - -/*! -Find the flick direction with respect to angle of flick -*/ -Direction WebTouchNavigation::findDirectionWithAngle(const QPoint& stPoint,const QPoint& endPoint) -{ - Direction direction; - int xDelta = endPoint.x() - stPoint.x(); - int yDelta = endPoint.y() - stPoint.y(); - - qreal angle = findAngle(xDelta, yDelta); - if(isNear(angle, 60.0, 120.0)) { - direction = DOWN; - } - else if(isNear(angle, 150.0, 210.0)) { - direction = LEFT; - } - else if(isNear(angle, 240.0, 300.0)) { - direction = UP; - } - else if(360.0 - KAngleTolerance <= angle || angle <= KAngleTolerance) { - direction = RIGHT; - } - else if(isNear(angle, 30.0, 60.0)) { - direction = BOTTOMRIGHT; - } - else if(isNear(angle, 120.0, 150.0)) { - direction = BOTTOMLEFT; - } - else if(isNear(angle, 210.0, 240.0)) { - direction = TOPLEFT; - } - else if(isNear(angle, 300.0, 330.0)) { - direction = TOPRIGHT; - } - - return direction; -} - -/* -Check the angle is in the range of aMinAngle and aMaxAngle -*/ -bool WebTouchNavigation::isNear(qreal angleUnderTest, qreal minAngle, qreal maxAngle) -{ - return (minAngle < angleUnderTest) && (angleUnderTest <= maxAngle); -} - -/* -Find the angle from x and y displacement -*/ -qreal WebTouchNavigation::findAngle(const int& xDelta,const int& yDelta) -{ - qreal angle = 0; - qreal hypotenuse = qSqrt(xDelta*xDelta + yDelta*yDelta); - - if(hypotenuse != 0) { - angle = qAcos(xDelta / hypotenuse); - - if(yDelta < 0) { - angle = (2 * PI) - angle; - } - } - - return (angle * 180) / PI; -} - -int WebTouchNavigation::roundOff(qreal num) -{ - return (num + 0.5); -} - -/* -Finds out the enclosing block -*/ -QRect WebTouchNavigation::findEnclosingBlock(QMouseEvent* ev) -{ - QWebHitTestResult htr = getHitTestResult(ev); - QRect rect = htr.enclosingBlockElement().geometry(); - return rect; -} - -/* -Gets the hitTestResult for a particular event -*/ -QWebHitTestResult WebTouchNavigation::getHitTestResult(QMouseEvent* ev) -{ - QPoint pt = ev->pos(); - QWebFrame* frame = m_webPage->frameAt(pt); - frame = (frame) ? frame : m_webPage->mainFrame(); - QWebHitTestResult htr = frame->hitTestContent(pt); - return htr; -} - -/* -Finds out the scroll distance associated with a swipe -*/ -void WebTouchNavigation::calculateActualScrollDistance() -{ - m_actualScrollDistance.setX(0); - m_actualScrollDistance.setY(0); - if (!m_dragPoints.isEmpty()) { - QPoint distance = previousPos() - currentPos(); - if (qAbs(distance.x()) > 0 || qAbs(distance.y()) > 0) { - m_actualScrollDistance = distance / m_dragPoints.size() * 2; - } - } -} - -/* -In the case of slow swipe, if the destination location lies within the threshold area, then -we need to align the block to te left edge of the mobile screen. This method finds out the -new scroll distance -*/ -void WebTouchNavigation::setNewScrollDistance(QPoint blockCanvasPoint, int thresholdCheckVal) -{ - m_scrollDistance.setX(m_actualScrollDistance.x()); - m_scrollDistance.setY(m_actualScrollDistance.y()); - if(blockCanvasPoint.x() > 0) { - //Checks whether the block falls within the threshold after right to left swipe - if( (thresholdCheckVal < KThresholdForRightToLeftMotion) && (thresholdCheckVal > 0)) { - //if the block is within the threshold range already and the user tries - //to swipe from left to right , then let it move to right. Dont try to - //snap to the left edge . - if(m_actualScrollDistance.x() > 0) { - m_scrollDistance.setX(blockCanvasPoint.x() - XAlignVal); - } - } - } - else { - //Checks whether the block falls within the threshold after left to right swipe - if( (thresholdCheckVal > KThresholdForLeftToRightMotion) && (thresholdCheckVal < 0)) { - //if the block is within the threshold range already and the user tries - //to swipe from right to left , then let it move to left. Dont try to - //snap to the left edge . - if (m_actualScrollDistance.x() < 0) { - m_scrollDistance.setX(blockCanvasPoint.x() - XAlignVal); - } - } - - } -} - - -/* -SLOT associated with the timer to adjust the scroll to the edge -*/ -void WebTouchNavigation::scrollToEdge() -{ - m_prevPoint.setX(m_scrollDistance.x()); - m_prevPoint.setY(m_scrollDistance.y()); - - m_scrollDistance.setX(m_scrollDistance.x() * KDecelerationFactor); - m_scrollDistance.setY(m_scrollDistance.y() * KDecelerationFactor); - - //round off the values - m_scrollDistance.setX(roundOff(m_scrollDistance.x())); - m_scrollDistance.setY(roundOff(m_scrollDistance.y())); - - int diffX = m_prevPoint.x() - m_scrollDistance.x(); - int diffY = m_prevPoint.y() - m_scrollDistance.y(); - - if (((m_scrollDistance.x() == 0) && (m_scrollDistance.y() == 0)) - || ((diffX == 0) && (diffY == 0))) { - scrollCurrentFrame(m_prevPoint.x(), m_prevPoint.y()); - m_scrollTimer->stop(); - return; - } - scrollCurrentFrame(diffX, diffY); -} -void WebTouchNavigation::timerControl() -{ - stopTimer();// stop timer as soon as timeout - emit longPressEvent(); -} -void WebTouchNavigation::startTimer() -{ - m_longPressTimer = new QTimer(this); - connect(m_longPressTimer,SIGNAL(timeout()),this,SLOT(timerControl())); - m_longPressTimer->start(LONG_PRESS_DURATION); -} -void WebTouchNavigation::stopTimer() -{ - if(m_longPressTimer){ - m_longPressTimer->stop(); - delete m_longPressTimer; - m_longPressTimer = 0; - } -} -void WebTouchNavigation::getFocusedElement() -{ - QWebHitTestResult htRes = m_frame->hitTestContent(m_touchPosition); - wrtBrowserDefs::BrowserElementType elType = wrtBrowserUtils::getTypeFromElement(htRes); - emit focusElementChanged(elType); -} - -void WebTouchNavigation::scrollCurrentFrame (int dx, int dy) -{ - QPoint scrollPosition = m_frame->scrollPosition(); - m_frame->scroll(dx, dy); - - /* emit pageScrollPositionZero singal if it's mainFrame scrolling or scroll to top*/ - if (m_frame == m_webPage->mainFrame()) { - if (scrollPosition.y() == 0 || m_frame->scrollPosition().y() == 0) { - emit pageScrollPositionZero(); - } - } -} - -void WebTouchNavigation::setCurrentFrameScrollPosition (QPoint& pos) -{ - QPoint scrollPosition = m_frame->scrollPosition(); - m_frame->setScrollPosition(pos); - - /* emit pageScrollPositionZero singal if it's mainFrame scrolling or scroll to top*/ - if (m_frame == m_webPage->mainFrame()) { - if (scrollPosition.y() == 0 || m_frame->scrollPosition().y() == 0) { - emit pageScrollPositionZero(); - } - } -} -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/webtouchnavigation.h --- a/browsercore/core/webtouchnavigation.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef WEBTOUCHNAVIGATION_H -#define WEBTOUCHNAVIGATION_H - -#include <QTime> -#include <qobject.h> -#include <qpoint.h> -#include <qevent.h> -#include <qobject.h> -#include <qtimeline.h> -#include <qwebframe.h> -#include <qwebelement.h> -#include "wrtBrowserDefs.h" -#include <QTime> - -class QWebFrame; -class QWebPage; -class QTimer; - -namespace WRT -{ - - enum Direction - { - DOWN, // SOUTH - UP, // NORTH - RIGHT, // EAST - LEFT, // WEST - BOTTOMRIGHT, // SOUTHEAST - BOTTOMLEFT, // SOUTHWEST - TOPLEFT, // NORTHWEST - TOPRIGHT // NORTHEAST - }; - - enum PanDirection { - HorizontalPan, - VerticalPan, - RandomPan - }; - - class DragPoint - { - public: - QPoint iPoint; - QTime iTime; - }; - - class WebTouchNavigation : public QObject - { - Q_OBJECT - public: - WebTouchNavigation(QWebPage* webPage,QObject* view); - virtual ~WebTouchNavigation(); - void install(); - void uninstall(); - void setPage( QWebPage * page){ m_webPage = page ;} -signals: - void longPressEvent();// mouse long press signal - void focusElementChanged(wrtBrowserDefs::BrowserElementType &);// mouse long press signal - void pageScrollPositionZero(); - - protected slots: - void scrollToEdge(); - void doubleClickTimerExpired(); - void timerControl();// local slot for controlling timer - void pan(); - void kineticScroll(); - void BlockFocusChanged(QPoint pt); - protected: - bool eventFilter(QObject *object, QEvent *event); - void mousePressEvent(const QPoint& pos); - void mouseMoveEvent(const QPoint& pos); - void mouseReleaseEvent(const QPoint& pos); - void mouseDoubleClickEvent(const QPoint& pos); - QWebFrame* getNextScrollableFrame(const QPoint& pos); - void scrollFrame(const QPoint& pos); - - void startScrollTimer(); - void updateFlickScrollDistance(); - bool isFlick() ; - QPoint speed() ; - QPoint currentPos(); - QPoint previousPos(); - qreal dragTime() const; - Direction findDirectionWithAngle(const QPoint& stPoint,const QPoint& endPoint); - bool isNear(qreal aAngleUnderTest, qreal aMinAngle, qreal aMaxAngle); - qreal findAngle(const int& xDelta,const int& yDelta); - int roundOff(qreal num); - QRect findEnclosingBlock(QMouseEvent* ev); - QWebHitTestResult getHitTestResult(QMouseEvent* ev); - void calculateActualScrollDistance(); - void setNewScrollDistance(QPoint blockCanvasPoint, int thresholdCheckVal); - void handleMousePressEvent(QMouseEvent* ev); - void handleMouseReleaseEvent(QMouseEvent* ev); - void handleDoubleClickEvent(QMouseEvent* ev); - - - private: - void highlightableElement(QMouseEvent* ev); - QWebElement getClosestAnchorElement(QMouseEvent* ev); - bool traverseNextNode(QWebElement parentNode,QWebElement& nextNode); - - void handleHighlightChange(QMouseEvent* ev); - bool canDehighlight(QMouseEvent* ev); - void dehighlight(QMouseEvent* ev); - void getFocusedElement(); - void startTimer(); - void stopTimer(); - - - void stopScrolling(); - - void startPanGesture(PanDirection); - void panBy(const QPointF& delta); - void scrollCurrentFrame (int dx, int dy); - void setCurrentFrameScrollPosition (QPoint& pos); - - private: - QWebPage* m_webPage; - QObject* m_view; - QWebFrame* m_frame; - bool m_scrolled; - QPoint m_touchPosition; - QPointF m_scrollDistance; - QPointF m_actualScrollDistance; - QPointF m_prevPoint; - QList<DragPoint> m_dragPoints; - Direction m_flickDirection; - QTime m_lastMoveEventTime; - QTimer* m_doubleClickTimer; - QMouseEvent *m_pressEvent; - QMouseEvent *m_releaseEvent; - QPoint m_focusedBlockPt; - QWebElement m_anchorElement; - QPoint m_higlightedPos; - bool m_ishighlighted; - int m_offset; - QTimer* m_longPressTimer;// long press timer - QPoint m_initialSpeed; - qreal m_finalzoomfactor; - QTimer* m_scrollTimer; - QPoint m_scrollDelta; - QTimer* m_kineticTimer; - QPointF m_kineticSpeed; - QTime m_actualTime; - int m_kineticScrollTime; - QPoint m_initialScrollPos; - bool m_isPanning; - QTime m_delayedPressMoment; - QPointF m_dragStartPos; - PanDirection m_panDirection; - QPointF m_panModeResidue; - - }; - -} - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/wrtbrowsercontainer.cpp --- a/browsercore/core/wrtbrowsercontainer.cpp Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/wrtbrowsercontainer.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,36 +1,31 @@ /* * 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: * */ - #include "browserpagefactory.h" -#include "webcontentview.h" -#include "wrtpage.h" #include "wrtbrowsercontainer_p.h" #include "wrtbrowsercontainer.h" #include "webpagedata.h" -#include "qwebhistory.h" -#include "qwebframe.h" #include "SchemeHandlerBr.h" #include "webnetworkaccessmanager.h" -#ifdef QT_MOBILITY_BEARER_MANAGEMENT -#include "WebNetworkConnectionManager.h" -#endif // QT_MOBILITY_BEARER_MANAGEMENT #include "webcookiejar.h" -#include "webnavigation.h" #include "secureuicontroller.h" #include "LoadController.h" #include "WebDialogProvider.h" @@ -39,18 +34,33 @@ #include <QAuthenticator> #include <QFile> #include <QMessageBox> +#include <QWebHistory> +#include <QWebFrame> +#include <QGraphicsWebView> + +QDataStream &operator<<(QDataStream &out, const WebPageData &myObj) +{ + out << myObj.m_thumbnail << myObj.m_zoomFactor << myObj.m_contentsPos; + return out; +} + +QDataStream &operator>>(QDataStream &in, WebPageData &myObj) +{ + in >> myObj.m_thumbnail >> myObj.m_zoomFactor >> myObj.m_contentsPos; + return in; +} namespace WRT { - -const int historyItemsCount = 20; +const int historyItemsCount = 10; WrtBrowserContainerPrivate::WrtBrowserContainerPrivate(QObject* parent, WrtBrowserContainer* page/*never NULL*/) : m_schemeHandler(new SchemeHandler()) , m_pageFactory(0) , m_widget(0) +, m_fileChooser(0) +, m_needUpdateThumbnail(false) { - assert(page); m_page = page; m_secureController = new WRT::SecureUIController(parent); @@ -70,6 +80,7 @@ delete m_schemeHandler; delete m_secureController; delete m_loadController; + delete m_fileChooser; } /*! @@ -90,35 +101,41 @@ } /*! - * \class WrtBrowserContainer - * \brief Description: This class is a handle to open page on which user can - * load an url , view history items, load an history item into the page etc. - * @see WrtPageManager - */ - -/*! * WrtBrowserContainer Constructor * @param parent : Widget parent */ WrtBrowserContainer::WrtBrowserContainer(QObject* parent) : - WrtPage(parent), d(new WrtBrowserContainerPrivate(this, this)) + QWebPage(parent), d(new WrtBrowserContainerPrivate(this, this)) { + + settings()->setAttribute(QWebSettings::PluginsEnabled, true); + settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("PopupBlocking").toInt()); // Download related enable "forwardUnsupportedContent" to redirect unsupported content to download manager setForwardUnsupportedContent(true); +#ifdef BEDROCK_TILED_BACKING_STORE + settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, true); + settings()->setAttribute(QWebSettings::ZoomTextOnly, false); + settings()->setAttribute(QWebSettings::FrameFlatteningEnabled, true); + + //Configure tiling properties + //This would set tile size to (256, 256) and add 25ms delay between constructing + //individual tiles. The settings would try to cache an area 1.5x width and 1.5x height + //of the current viewport (centered to the viewport) with tiles and would drop tiles + //after they are outside an area 2x the width and 2.5x the height of the viewport. + //Refer https://bugs.webkit.org/show_bug.cgi?id=39874 + + setProperty("_q_TiledBackingStoreTileSize", QSize(256, 256)); + setProperty("_q_TiledBackingStoreTileCreationDelay", 25); + setProperty("_q_TiledBackingStoreCoverAreaMultiplier", QSizeF(1.5, 1.5)); + setProperty("_q_TiledBackingStoreKeepAreaMultiplier", QSizeF(2., 2.5)); +#endif #ifndef NO_NETWORK_ACCESS_MANAGER setNetworkAccessManager(new WebNetworkAccessManager(this,this)); #endif -#ifdef QT_MOBILITY_BEARER_MANAGEMENT - setNetworkConnectionManager(new WebNetworkConnectionManager(this)); -#endif // QT_MOBILITY_BEARER_MANAGEMENT history()->setMaximumItemCount(historyItemsCount); - connect(this, - SIGNAL(saveFrameStateRequested(QWebFrame*, QWebHistoryItem*)), - this, SLOT(savePageDataToHistoryItem(QWebFrame*, QWebHistoryItem*))); - /* Connect secure related signals and slots */ connect(mainFrame(), SIGNAL(urlChanged(QUrl)), d->m_secureController, SLOT(setTopLevelScheme(const QUrl &))); connect(this, SIGNAL(loadFinished(bool)), d->m_secureController, SLOT( endSecureCheck(bool) ) ); @@ -130,9 +147,6 @@ connect(this, SIGNAL(loadFinished(bool)), d->m_loadController, SLOT(loadFinished(bool))); connect(mainFrame(), SIGNAL(urlChanged(QUrl)), d->m_loadController, SLOT(urlChanged(QUrl))); - // All pages in the browser share the same pageGroup. - d->m_pageGroupName = "nokia_page_group"; - setPageGroupName(d->m_pageGroupName); } /*! @@ -146,6 +160,19 @@ //setNetworkAccessManager(NULL); delete d; + + // + QList<QWebHistoryItem> items = history()->items(); + + for (int i = 0; i < history()->count(); i++) { + QWebHistoryItem item = items.at(i); + WebPageData* data = (WebPageData*)(item.userData().value<void*>()); + if(data){ + QVariant variant; + item.setUserData(variant); + delete data; + } + } } QGraphicsWidget* WrtBrowserContainer::webWidget() const @@ -155,10 +182,6 @@ void WrtBrowserContainer::setWebWidget(QGraphicsWidget* view) { - if(d->m_widget) { - disconnect(static_cast<WebContentWidget*>(webWidget()), SIGNAL(pageZoomMetaDataChange(QWebFrame*, ZoomMetaData)), this, SLOT(pageZoomMetaDataChange(QWebFrame*, ZoomMetaData))); - } - d->m_widget = view; if (view) @@ -167,11 +190,6 @@ if(webView) webView->setPage(this); - /* Currently connecting it here. Need to revisit if the dialog is enabled in the - * context of multiple windows */ - connect( d->m_secureController, SIGNAL( showMessageBox(WRT::MessageBoxProxy*)), static_cast<WebContentWidget*>(webWidget())->view(), SLOT( showMessageBox(WRT::MessageBoxProxy*))); - - connect(static_cast<WebContentWidget*>(webWidget()), SIGNAL(pageZoomMetaDataChange(QWebFrame*, ZoomMetaData)), this, SLOT(pageZoomMetaDataChange(QWebFrame*, ZoomMetaData))); } } @@ -193,48 +211,6 @@ } /*! - * Gets the history count for this page, i.e gets the number of urls loaded - * onto this page - * @return History count of this page - */ -int WrtBrowserContainer::getHistoryCount() const -{ - return history()->count(); -} - -/*! - * Triggers public Action - * @param WebAction : web action to be triggred - * @param checked : true/false - * @see WebAction - */ -/*void WrtBrowserContainer::triggerAction(QWebPage::WebAction action, bool checked) - { - triggerAction(action, checked); - } - */ - -/*! - * clears cookies - */ -void WrtBrowserContainer::clearCookies() -{ - return ((CookieJar*) networkAccessManager()->cookieJar())->clear(); -} - -bool WrtBrowserContainer::clearNetworkCache() -{ - bool ok = false; - QAbstractNetworkCache* diskCache = networkAccessManager()->cache(); - diskCache->clear(); - if (!diskCache->cacheSize()) { - // Unless there was failures clearing the cache cacheSize() should return 0 after a call to clear - ok = true; - } - return ok; -} - -/*! * This function page thumbnail for this page as specified by X & Y co-ordinate scale factors * @param scaleX : X Co-ordinate scale factor for the page thumbnail * @param scaleY : y Co-ordinate scale factor for the page thumbnail @@ -253,97 +229,11 @@ painter.drawRect(r); painter.restore(); mainFrame()->render(&painter, clip); - return image; -} - -/*! - * sets the page zoom factor as specified by zoom - * @param zoom : page zoom factor to be set - */ -void WrtBrowserContainer::setPageZoomFactor(qreal zoom) -{ - // FiX ME ... canvas zoom doesn't seem to support text-only zooming. - //static_cast<WebCanvasWidget*>(webWidget())->canvas()->setPageZoomFactor(zoom); - - bool isZoomTextOnly = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value( - "ZoomTextOnly").toBool(); - - if (!isZoomTextOnly) - { - // mainFrame()->setZoomFactor(zoom); - static_cast<WebContentWidget*> (webWidget())->setZoomFactor(zoom); - } - else - { - //mainFrame()->setTextSizeMultiplier(zoom); - static_cast<WebContentWidget*> (webWidget())->setTextSizeMultiplier( - zoom); - } -} - -/*! - * setpageDirtyZoomFactor - * @param zoom: page zoom factor to be set - */ -void WrtBrowserContainer::setPageDirtyZoomFactor(qreal zoom) -{ - // FIXME: dirty page zoom is not supported yet in single-buffer mode. - static_cast<WebContentWidget*> (webWidget())->setDirtyZoomFactor(zoom); + QImage thumbnail = image.scaled(scaleX * size.width(), scaleY * size.height()); + return thumbnail; } /*! - * setpageCenterZoomFactor - * @param zoom: center page zoom factor to be set - */ -// TODO: hold on this change until zoom/scrolling improvement -/* - void WrtBrowserContainer::setPageCenterZoomFactor(qreal zoom) - { - static_cast<WebCanvasWidget*>(webWidget())->canvas()->setPageCenterZoomFactor(zoom); - } - */ -/*! - * returns the current page zoom factor of this page - * @return current zoom factor - */ -qreal WrtBrowserContainer::pageZoomFactor() const -{ - return static_cast<WebContentWidget*> (webWidget())->zoomFactor(); -} - -/*! - * sets the Canvas ScaleFactor for this page - * @param scaleX : X Co-ordinate scale factor - * @param scaleY : Y Co-ordinate scale factor - */ -void WrtBrowserContainer::setCanvasScaleFactor(qreal scaleX, qreal scaleY) -{ - QTransform transform; - transform.scale(scaleX, scaleY); - // static_cast<ContentView*>(webWidget())->setTransform(transform); -} - -/*! - * allows offlineStorage for url - * @param url : url for which offlinestorage has to be enabled - */ -bool WrtBrowserContainer::allowOfflineStorage(const QUrl& url) -{ - if (BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("SecurityLevel").toInt() - != SecurityHigh) - return true; - - QStringList yesno; - yesno << "Yes" << "No"; - return (WebDialogProvider::getButtonResponse( - 0, /* webWidget(), Check, that widget is required */ - QString( - "Offline Database: This host asking for storing data in offline database, allow?"), - yesno)); -} - - -/*! Pulic Slots: void savePageDataToHistoryItem(QWebFrame*, QWebHistoryItem* item); void slotAuthenticationRequired(QNetworkReply *, QAuthenticator *); @@ -367,8 +257,8 @@ WebPageData data(this); // WebPageData data = item->userData().value<WebPageData>(); - data.m_zoomFactor = pageZoomFactor(); - data.m_thumbnail = pageThumbnail(1.0, 1.0);//data.m_zoomFactor, data.m_zoomFactor); + data.m_zoomFactor = 1.0; // Need to find a way to get this. Not used right now anyway + data.m_thumbnail = pageThumbnail(0.5, 0.5);//data.m_zoomFactor, data.m_zoomFactor); QPoint pos(0, 0); // pos = static_cast<WebCanvasWidget*>(webWidget())->canvas()->canvasToDocument(pos); @@ -413,39 +303,11 @@ } } -QWebPage* WrtBrowserContainer::createWindow( - QWebPage::WebWindowType webWindowType) -{ - - /* When WrtPage is created, QWebSettings::JavascriptCanOpenWindows is initialized - * to popup setting value. Need not do any check here - */ - if (d->m_pageFactory) - { - // no need to signal in this case - return d->m_pageFactory->openPage(); - } - - WrtBrowserContainer* wrtPage = new WrtBrowserContainer(); - emit createNewWindow(wrtPage); - return wrtPage; -} - void WrtBrowserContainer::setPageFactory(BrowserPageFactory* f) { d->m_pageFactory = f; } -void WrtBrowserContainer::setElementType( - wrtBrowserDefs::BrowserElementType& aElType) -{ - m_elementType = aElType; -} -wrtBrowserDefs::BrowserElementType WrtBrowserContainer::getElementType() -{ - return m_elementType; -} - QString WrtBrowserContainer::pageTitle(){ QString title = mainFrame()->title(); @@ -495,14 +357,6 @@ return result; } -void WrtBrowserContainer::pageZoomMetaDataChange(QWebFrame* frame, ZoomMetaData zoomData ){ - - //qDebug() << __func__ << "Frame " << frame << "My Frame " << mainFrame(); - if (frame == mainFrame()) { - setPageZoomMetaData(zoomData); - } -} - ZoomMetaData WrtBrowserContainer::pageZoomMetaData() { return d->m_zoomData ; @@ -513,6 +367,58 @@ } +WrtBrowserFileChooser::~WrtBrowserFileChooser() +{} + +void WrtBrowserContainer::setFileChooser(WrtBrowserFileChooser * chooser) +{ + if (d->m_fileChooser) { + delete d->m_fileChooser; + } + + d->m_fileChooser = chooser; +} + +QString WrtBrowserContainer::chooseFile(QWebFrame * parentFrame, const QString & suggestedFile) +{ + if (d->m_fileChooser != 0) { + return d->m_fileChooser->chooseFile(parentFrame, suggestedFile); + } + + return QWebPage::chooseFile(parentFrame, suggestedFile); +} + +QString WrtBrowserContainer::userAgentForUrl(const QUrl& url) const +{ + QString uaString = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("UserAgentString"); + + if (uaString.isEmpty()) + { + QUrl url; + return QWebPage::userAgentForUrl(url); + } + else + return uaString; +} + +WRT::WrtBrowserContainer* WrtBrowserContainer::createWindow( + QWebPage::WebWindowType webWindowType) +{ + + /* When WrtPage is created, QWebSettings::JavascriptCanOpenWindows is initialized + * to popup setting value. Need not do any check here + */ + if (d->m_pageFactory) + { + // no need to signal in this case + return d->m_pageFactory->openPage(); + } + + WrtBrowserContainer* wrtPage = new WrtBrowserContainer(); + emit createNewWindow(wrtPage); + return wrtPage; } +} // namespace WRT + diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/wrtbrowsercontainer.h --- a/browsercore/core/wrtbrowsercontainer.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/wrtbrowsercontainer.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,28 +1,30 @@ /* * 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 __WRTBROWSERCONTAINER_H__ #define __WRTBROWSERCONTAINER_H__ #include "brtglobal.h" -#include "qwebpage.h" -#include "wrtpage.h" +#include <QWebPage> #include "wrtbrowsercontainer_p.h" #include "wrtBrowserDefs.h" #include "ZoomMetaData.h" @@ -42,55 +44,36 @@ namespace WRT { -class WrtPage; class WrtController; class WrtBrowserContainerPrivate; class SchemeHandler; class SecureUIController; class LoadController; -class WRT_BROWSER_EXPORT WrtBrowserContainer : public WrtPage +class WRT_BROWSER_EXPORT WrtBrowserFileChooser +{ +public: + virtual ~WrtBrowserFileChooser(); + virtual QString chooseFile(QWebFrame * parentFrame, const QString & suggestedFile) = 0; +}; + +class WRT_BROWSER_EXPORT WrtBrowserContainer : public QWebPage { Q_OBJECT public: - /*! - * enum for security Level - */ - enum { - /**Low security*/ - SecurityLow, - /**Meduium Security*/ - SecurityMedium, - /**High Security*/ - SecurityHigh - }; - -public: static WrtBrowserContainer* createPageWithWidgetParent(QObject* parent=0,WrtBrowserContainer* page=0); explicit WrtBrowserContainer(QObject* parent = 0); virtual ~WrtBrowserContainer(); + virtual WrtBrowserContainer* createWindow(QWebPage::WebWindowType); + QGraphicsWidget* webWidget() const; void setWebWidget(QGraphicsWidget* view); SchemeHandler* schemeHandler() const; - int getHistoryCount() const; - void clearCookies(); - bool clearNetworkCache(); - QImage pageThumbnail(qreal scaleX, qreal scaley); - void setPageZoomFactor(qreal zoom); - void setPageDirtyZoomFactor(qreal zoom); -// TODO: Hold on this hookup after zooming and scrolling improvment -// void setPageCenterZoomFactor(qreal zoom); - qreal pageZoomFactor() const; - void setCanvasScaleFactor(qreal scaleX, qreal scaleY); - bool allowOfflineStorage(const QUrl& url); - - QWebPage* createWindow(QWebPage::WebWindowType webWindowType); void setPageFactory(BrowserPageFactory* f); - wrtBrowserDefs::BrowserElementType getElementType(); QString pageTitle(); @@ -103,13 +86,22 @@ /* Indicates whether this is a blank window with no page loaded*/ bool emptyWindow(); bool restoreSession(); + + void setFileChooser(WrtBrowserFileChooser * chooser); + void setUpdateThumbnail(bool update) { d->m_needUpdateThumbnail = update; } + bool needUpdateThumbnail() { return d->m_needUpdateThumbnail; } + +protected: + virtual QString chooseFile(QWebFrame * parentFrame, const QString & suggestedFile); + virtual QString userAgentForUrl(const QUrl& url) const; + + Q_SIGNALS: + void createNewWindow(WrtBrowserContainer* page); - void pageScrollPositionZero(); - void longPressEvent(); void secureStateChange(int); public slots: @@ -118,13 +110,10 @@ void slotProxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *); private slots: - void setElementType(wrtBrowserDefs::BrowserElementType& aElType); void pageSecureState(int); - void pageZoomMetaDataChange(QWebFrame*, ZoomMetaData); private: WrtBrowserContainerPrivate* d; - wrtBrowserDefs::BrowserElementType m_elementType; }; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/wrtbrowsercontainer_p.h --- a/browsercore/core/wrtbrowsercontainer_p.h Fri May 14 15:40:36 2010 +0300 +++ b/browsercore/core/wrtbrowsercontainer_p.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,26 +1,30 @@ /* * 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 __WRTBROWSERCONTAINER_P_H__ #define __WRTBROWSERCONTAINER_P_H__ #include "ZoomMetaData.h" class QGraphicsWidget; +class QObject; struct BrowserPageFactory; struct ZoomMetaData; @@ -28,9 +32,10 @@ class SchemeHandler; class SecSession; class WrtBrowserContainer; + class WrtBrowserFileChooser; class SecureUIController; class LoadController; - + class WrtBrowserContainerPrivate { public: @@ -38,12 +43,13 @@ ~WrtBrowserContainerPrivate(); WrtBrowserContainer* m_page; SchemeHandler* m_schemeHandler; - QString m_pageGroupName; BrowserPageFactory* m_pageFactory; QGraphicsWidget* m_widget; WRT::SecureUIController *m_secureController; //Owned WRT::LoadController * m_loadController; //Owned ZoomMetaData m_zoomData; + WrtBrowserFileChooser * m_fileChooser; // Owned + bool m_needUpdateThumbnail; }; } #endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/wrtpage.cpp --- a/browsercore/core/wrtpage.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "wrtpage.h" -#include "qwebhistory.h" -#include "webpagedata.h" -//#include "wrtsettings.h" -#include "bedrockprovisioning.h" -#ifdef QT_MOBILITY_BEARER_MANAGEMENT -#include "WebNetworkConnectionManager.h" -#endif // QT_MOBILITY_BEARER_MANAGEMENT - -#include <QMessageBox> -#include <QFile> -#include <QTextStream> -#include <QDesktopServices> -#include <QDir> - -void QWEBKIT_EXPORT qt_webpage_setGroupName(QWebPage* page, const QString& groupName); -void QWEBKIT_EXPORT qt_websettings_setOfflineWebApplicationCachePath(const QString& path); - -QDataStream &operator<<(QDataStream &out, const WebPageData &myObj) -{ - out << myObj.m_thumbnail << myObj.m_zoomFactor << myObj.m_contentsPos; - return out; -} - -QDataStream &operator>>(QDataStream &in, WebPageData &myObj) -{ - in >> myObj.m_thumbnail >> myObj.m_zoomFactor >> myObj.m_contentsPos; - return in; -} - -namespace WRT { - -WrtPage::WrtPage(QObject *parent) : QWebPage(parent) -{ - settings()->setAttribute(QWebSettings::PluginsEnabled, true); - settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("PopupBlocking").toInt()); - - // Initialization below can only be done once per Webkit instance (and not once per page) - // otherwise it hits an ASSERT in WebKit in debug mode - static bool initialized = false; - - if (!initialized) { - QString storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); - - QWebSettings::setOfflineStoragePath(QDir::toNativeSeparators(QDir(storagePath).filePath("WebDatabase"))); -#if defined CWRTINTERNALWEBKIT - qt_websettings_setOfflineWebApplicationCachePath(QDir::toNativeSeparators(QDir(storagePath).filePath("ApplicationCache"))); -#endif - initialized = true; - } - -#ifdef QT_MOBILITY_BEARER_MANAGEMENT - m_ConnectionManager = 0; -#endif // QT_MOBILITY_BEARER_MANAGEMENT -} - -WrtPage::~WrtPage() -{ - QList<QWebHistoryItem> items = history()->items(); - - for (int i = 0; i < history()->count(); i++) { - QWebHistoryItem item = items.at(i); - WebPageData* data = (WebPageData*)(item.userData().value<void*>()); - if(data){ - QVariant variant; - item.setUserData(variant); - delete data; - } - } -#ifdef QT_MOBILITY_BEARER_MANAGEMENT - if (m_ConnectionManager) - delete m_ConnectionManager; -#endif // QT_MOBILITY_BEARER_MANAGEMENT -} - -void WrtPage::setPageGroupName(const QString& groupName) -{ - qt_webpage_setGroupName(this, groupName); -} - -QWebPage* WrtPage::createWindow(QWebPage::WebWindowType webWindowType) -{ - WrtPage* wrtPage = new WrtPage(); - emit createWindow(wrtPage); - return wrtPage; -} - - -/*! -// implementation of javaScriptConsoleMessage defined in WebKit qwebpage.h -// User settings are provided through WrtSettingsUI. -// The following choices are offered: -// Logging Off;Log to file;Show pop-up notes;Log to file and show pop-up notes -*/ -void WrtPage::javaScriptConsoleMessage(const QString& messageSource, const QString& messageLevel, const QString& message, int lineNumber, const QString& sourceID) -{ - - int jsSetting = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value ( "JavaScriptConsoleLog" ).toInt(); - QString logFileName = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value ( "JavaScriptConsoleLogFilePath" ).toString(); - QString msg = ( "JS Console Log: "+ ( QDate::currentDate() ).toString ( "dd.MM.yyyy" ) +" "+ ( QTime::currentTime() ).toString ( "hh:mm:ss ap" ) +"\nMessage src: "+messageSource+" : "+messageLevel+"\nMessage: " + message + "\nSource: "+sourceID+" : "+QString::number(lineNumber) ); - - if ( jsSetting == 2 || jsSetting == 3 ){ - //display this simple dialog box for now. - QMessageBox::about(view(), "JavaScript Console", msg); - } - if ( jsSetting == 1 || jsSetting == 3 ){ - // message is logged to file - QFile jsFile ( logFileName ); - if ( !jsFile.open ( QIODevice::Append ) ) return; - - QTextStream jsLog ( &jsFile ); - jsLog << msg << "\n"; - jsFile.close(); - } - // Emit message in case some view manager wants to implement a better GUI to display console messages - emit jsConsoleMessage(messageSource, messageLevel, message, lineNumber, sourceID); - -} - -#ifdef QT_MOBILITY_BEARER_MANAGEMENT -void WrtPage::setNetworkConnectionManager(WebNetworkConnectionManager *manager) -{ - if (manager == m_ConnectionManager) - return; - if (m_ConnectionManager && m_ConnectionManager->parent() == this) - delete m_ConnectionManager; - m_ConnectionManager = manager; -} -#endif // QT_MOBILITY_BEARER_MANAGEMENT -} // end of namespace WRT - diff -r b0dd75e285d2 -r 0954f5dd2cd0 browsercore/core/wrtpage.h --- a/browsercore/core/wrtpage.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef __WRTPAGE_H__ -#define __WRTPAGE_H__ - -#include <QWidget> -#include "qwebpage.h" - -namespace WRT { - -#ifdef QT_MOBILITY_BEARER_MANAGEMENT -class WebNetworkConnectionManager; -#endif // QT_MOBILITY_BEARER_MANAGEMENT - -class WrtPage : public QWebPage -{ - Q_OBJECT -public: - WrtPage(QObject *parent=0); - virtual ~WrtPage(); - - void setPageGroupName(const QString&); - -public: - virtual QWebPage* createWindow(QWebPage::WebWindowType); - virtual void javaScriptConsoleMessage(const QString& messageSource, const QString& messageLevel, const QString& message, int lineNumber, const QString& sourceID); -#ifdef QT_MOBILITY_BEARER_MANAGEMENT - void setNetworkConnectionManager(WebNetworkConnectionManager *manager); -#endif // QT_MOBILITY_BEARER_MANAGEMENT - -Q_SIGNALS: - void createWindow(WrtPage* page); - void jsConsoleMessage(const QString& messageSource, const QString& messageLevel, const QString& message, int lineNumber, const QString& sourceID); - - -public slots: - //TODO always let js run for now. This allows sunspider testsuite to finish. But it will break the infinite loop test case. - //TODO change to true after performance is improved and each sunspider test can finish in 10s. - bool shouldInterruptJavaScript() { - return false; - } - -private: -#ifdef QT_MOBILITY_BEARER_MANAGEMENT - WebNetworkConnectionManager *m_ConnectionManager; -#endif // QT_MOBILITY_BEARER_MANAGEMENT -}; - -} -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 browserui.pri --- a/browserui.pri Fri May 14 15:40:36 2010 +0300 +++ b/browserui.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,59 +1,46 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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". +# +# 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. # -# Initial Contributors: -# Nokia Corporation - initial contribution. +# 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/". # -# Contributors: +# Description: # -# Description: +# BrowserUi - common settings - browserui.pri +# +# any edits made here that are common to app and mw should also be made +# in the mw\browser\browser.pri file # -# Build using default nestwork access mgr -#DEFINES+=NO_NETWORK_ACCESS_MANAGER - -# Build without page resizing on load -#DEFINES+=NO_RESIZE_ON_LOAD - -# Build without gestures -DEFINES += NO_QSTM_GESTURE - -# Build without chrome -#DEFINES += __gva_no_chrome__ - -# Enable setting Default IAP -symbian: { - !contains(what, plat_101) { - # Enable setting Default IAP - DEFINES += SET_DEFAULT_IAP - } -} - -# Enable perfTracer -#DEFINES += ENABLE_PERF_TRACE isEmpty(_BROWSERUI_PRI_INCLUDED_): { - + _BROWSERUI_PRI_INCLUDED_=1 symbian { CONFIG += debug_and_release MMP_RULES += EXPORTUNFROZEN } - + CONFIG(debug, debug|release) { SUBDIRPART = Debug } else { SUBDIRPART = Release } - + # Figure out the root of where stuff should go (this could be done via configure) - + symbian { OUTPUT_DIR = $$PWD } else { @@ -67,18 +54,52 @@ DESTDIR = $$OUTPUT_DIR/WrtBuild/$$SUBDIRPART/bin QMAKE_RPATHDIR = $$DESTDIR $$QMAKE_RPATHDIR QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR - + # Add the output dirs to the link path too LIBS += -L$$DESTDIR - + DEPENDPATH += . INCLUDEPATH += . QMAKE_CXXFLAGS_DEBUG += -g - + CONFIG(gcov) { LIBS += -lgcov QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage } + ######################### + # Feature Flags + ######################### + br_mobility_bearer=no + br_mobility_sysinfo=no + br_fast_allocator=no + br_download_mgr=no + br_default_iap=no + br_orbit_ui=no + br_openurl=no + br_tiled_backing_store=no + + # For now Symbian only, Windows, Maemo will use the defaults + symbian { + contains (browser_addon, fivezero) { + br_fast_allocator=yes + br_download_mgr=yes + br_mobility_sysinfo=yes + br_mobility_bearer=yes + } + contains (browser_addon, ninetwo) { + br_fast_allocator=yes + br_download_mgr=yes + br_mobility_sysinfo=yes + br_mobility_bearer=yes + } + isEmpty (browser_addon){ + browser_addon=no + br_mobility_sysinfo=yes + br_mobility_bearer=yes + br_orbit_ui=yes + br_openurl=yes + } + } } diff -r b0dd75e285d2 -r 0954f5dd2cd0 browserui.pro --- a/browserui.pro Fri May 14 15:40:36 2010 +0300 +++ b/browserui.pro Tue Jun 29 00:46:29 2010 -0400 @@ -2,16 +2,21 @@ CONFIG += ordered include (browserui.pri) + SUBDIRS += bedrockProvisioning + SUBDIRS += browsercore + SUBDIRS += ginebra2 +# rom MUST come last because it depends on *_template.pkg files generated by qmake from all the other apps + SUBDIRS += rom -SUBDIRS += bedrockProvisioning -SUBDIRS += browsercore -SUBDIRS += ginebra2 -# rom MUST come last because it depends on *_template.pkg files generated by qmake from all the other apps -SUBDIRS += rom +contains( what, tests ) { + exists($$PWD/internal/tests/perfTracing/perfTracing.pro): SUBDIRS += internal/tests/perfTracing/perfTracing.pro + exists($$PWD/internal/tests/mw/mw.pro): SUBDIRS += internal/tests/mw/mw.pro + exists($$PWD/internal/tests/Bookmarks_Test/Bookmarks_Test.pro): SUBDIRS += internal/tests/mw/Bookmarks_Test/Bookmarks_Test.pro +} symbian: { -contains(what, plat_101 ) { +contains(browser_addon, no ) { BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \ "rom/browser.iby CORE_APP_LAYER_IBY_EXPORT_PATH(browser.iby)" } diff -r b0dd75e285d2 -r 0954f5dd2cd0 common/common.pri --- a/common/common.pri Fri May 14 15:40:36 2010 +0300 +++ b/common/common.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # # include path diff -r b0dd75e285d2 -r 0954f5dd2cd0 common/commonExternals.pri --- a/common/commonExternals.pri Fri May 14 15:40:36 2010 +0300 +++ b/common/commonExternals.pri Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,22 @@ -# -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: +# +# Setup common settings for all demos # # Everything should be relative to ROOT_DIR (makes cut-and-paste safer). @@ -58,7 +63,16 @@ $$QMAKE_RPATHDIR # Import pre-built binary components. -include($$ROOT_DIR/import/import.pri) +symbian: { + contains (br_download_mgr, yes) { + DEFINES += USE_DOWNLOAD_MANAGER=1 + INCLUDEPATH += /epoc32/include/applications + LIBS += -lBrServiceIPCClient + LIBS += -lBrDownloadMgr + } +} else { + include($$ROOT_DIR/import/import.pri) +} # BedrockProvisioning INCLUDEPATH += $$ROOT_DIR/sf/app/browserui/bedrockProvisioning diff -r b0dd75e285d2 -r 0954f5dd2cd0 flags.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flags.pri Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,16 @@ +# Build using default nestwork access mgr +#DEFINES+=NO_NETWORK_ACCESS_MANAGER + +# Build without page resizing on load +#DEFINES+=NO_RESIZE_ON_LOAD + +# Build without gestures +DEFINES += NO_QSTM_GESTURE + +# Build without chrome +#DEFINES += __gva_no_chrome__ + +# Enable perfTracer +#DEFINES += ENABLE_PERF_TRACE + +#DEFINES += NO_HISTORY diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/LocaleDelegate.cpp --- a/ginebra/LocaleDelegate.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include <QString> -//#include <QLocale> -#include "chromeview.h" -#include "LocaleDelegate.h" - -#include <qdebug.h> - -const QString JS_PREFIX = "txt_browser_"; - -LocaleDelegate::LocaleDelegate(ChromeView* chrome) -{ - setObjectName("localeDelegate"); -} - -LocaleDelegate::~LocaleDelegate() -{ -} - -/* -* Load the localized string based on the string id -*/ -QString LocaleDelegate::translateText(const QString & textToTranlsate) -{ - QString ret = tr((JS_PREFIX + textToTranlsate).toLatin1()); - qDebug() << "LocaleDelegate::translateText " << ret; - return ret; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/LocaleDelegate.h --- a/ginebra/LocaleDelegate.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef LOCALEDELEGATE_H -#define LOCALEDELEGATE_H - -#include <QObject> -#include <QString> - - -class ChromeView; -class QString; - -/* - * This class will be enriched later on - * - */ -class LocaleDelegate : public QObject { - Q_OBJECT - public: - LocaleDelegate(ChromeView* chrome); - ~LocaleDelegate(); - - public slots: - QString translateText(const QString &); - -}; - -#endif // LOCALEDELEGATE_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/bounceanimator.cpp --- a/ginebra/animations/bounceanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "bounceanimator.h" -#include "../chromesnippet.h" -#include "QTransform" - -BounceAnimator::BounceAnimator(ChromeSnippet* m_snippet) - : AttentionAnimator(m_snippet) -{ -} - -BounceAnimator::~BounceAnimator() -{ -} - -void BounceAnimator::updateAttention(qreal step) -{ - - qreal dy = (step -0.5)*10.0; - //qDebug() << "Bounce%: " << step; - m_snippet->moveBy(0.0, -dy); - -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/bounceanimator.h --- a/ginebra/animations/bounceanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_BOUNCE_ANIMATOR_H_ -#define _GINEBRA_BOUNCE_ANIMATOR_H_ - -#include <QObject> -#include "../attentionanimator.h" - -class QObject; -class ChromeSnippet; - -class BounceAnimator : public AttentionAnimator -{ - Q_OBJECT - - public: - BounceAnimator(ChromeSnippet* snippet); - void toggleActive(); - virtual ~BounceAnimator(); - public slots: - virtual void updateAttention(qreal step); -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/fadeanimator.cpp --- a/ginebra/animations/fadeanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "fadeanimator.h" -#include "../chromesnippet.h" -#include <QList> - -FadeAnimator::FadeAnimator(ChromeSnippet* m_snippet) - : VisibilityAnimator(m_snippet), - m_minOpacity(0.1) -{ -} - -FadeAnimator::~FadeAnimator() -{ -} - -void FadeAnimator::updateVisibility(qreal step) -{ - //qDebug() << step; - qreal o = 1.0 - step; - if(o > m_minOpacity){ - m_snippet->setOpacity(o); - } -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/fadeanimator.h --- a/ginebra/animations/fadeanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_FADE_ANIMATOR_H_ -#define _GINEBRA_FADE_ANIMATOR_H_ - -#include <QObject> -#include "../visibilityanimator.h" - -class ChromeSnippet; -class QPainterPath; - -class FadeAnimator : public VisibilityAnimator -{ - Q_OBJECT - - public: - FadeAnimator(ChromeSnippet* snippet); - virtual ~FadeAnimator(); - void setMinimumOpacity(qreal value) {m_minOpacity = value;} - public slots: - virtual void updateVisibility(qreal step); - private: - qreal m_minOpacity; -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/flyoutanimator.cpp --- a/ginebra/animations/flyoutanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "flyoutanimator.h" -#include <QPainterPath> -#include "../chromesnippet.h" -#include <QList> - -FlyoutAnimator::FlyoutAnimator(ChromeSnippet* m_snippet) - : VisibilityAnimator(m_snippet) -{ - m_path = new QPainterPath(); - m_path->moveTo(0,0); - m_path->quadTo(m_snippet->ownerArea().width()*2,-m_snippet->ownerArea().height(), 500, -400); //QUAD RIGHT -} - -FlyoutAnimator::~FlyoutAnimator() -{ - delete m_path; -} - -void FlyoutAnimator::setPath(QPainterPath * path) -{ - delete m_path; - m_path = path; -} - -void FlyoutAnimator::updateVisibility(qreal start) -{ - - qreal pathPercent = start; - QList<QGraphicsItem*> snippets = m_snippet->childItems(); - if(snippets.size() > 0){ - for(int i = 0; i < snippets.size(); i++){ - if(pathPercent < 1.0){ - qreal xoffset = m_path->pointAtPercent(pathPercent).x(); - qreal yoffset = m_path->pointAtPercent(pathPercent).y(); - snippets[i]->setPos(xoffset, yoffset); - pathPercent += 0.05; - } - } - if(start == 0){ - m_snippet->updateChildGeometries(); // Make sure we go back to original state - } - } else { - QTransform transform; - transform.translate(m_path->pointAtPercent(start).x(), m_path->pointAtPercent(start).y()); - m_snippet->setTransform(transform); - } - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/flyoutanimator.h --- a/ginebra/animations/flyoutanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_FLYOUT_ANIMATOR_H_ -#define _GINEBRA_FLYOUT_ANIMATOR_H_ - -#include <QObject> -#include "../visibilityanimator.h" - -class ChromeSnippet; -class QPainterPath; - -class FlyoutAnimator : public VisibilityAnimator -{ - Q_OBJECT - - public: - FlyoutAnimator(ChromeSnippet* snippet); - virtual ~FlyoutAnimator(); - void setPath(QPainterPath* path); - public slots: - virtual void updateVisibility(qreal step); - - private: - QPainterPath* m_path; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/malstromanimator.cpp --- a/ginebra/animations/malstromanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "malstromanimator.h" -#include <QPainterPath> -#include "../chromesnippet.h" -#include <QList> - -MalstromAnimator::MalstromAnimator(ChromeSnippet* m_snippet) - : VisibilityAnimator(m_snippet) -{ - m_path = new QPainterPath(); - m_path->moveTo(0,0); - //m_path->lineTo(m_snippet->ownerArea().width()*2, 0); //LINE RIGHT - //m_path->quadTo(m_snippet->ownerArea().width()*2,-m_snippet->ownerArea().height(), 500, -400); //QUAD RIGHT - m_path->arcTo(0.0, 0.0, 300.0, -200.0, 0.0, 60.0); -} - -MalstromAnimator::~MalstromAnimator() -{ - delete m_path; -} - -void MalstromAnimator::setPath(QPainterPath * path) -{ - delete m_path; - m_path = path; -} - -void MalstromAnimator::updateVisibility(qreal start) -{ - - qreal pathPercent = start; - QList<QGraphicsItem*> snippets = m_snippet->childItems(); - if(snippets.size() > 0){ - for(int i = 0; i < snippets.size(); i++){ - if(pathPercent < 1.0){ - int xoffset = (int)m_path->pointAtPercent(pathPercent).x(); - int yoffset = (int)m_path->pointAtPercent(pathPercent).y(); - snippets[i]->setPos(xoffset, yoffset); - QTransform t; - t.scale(1.0-start, 1.0-start); - snippets[i]->setTransform(t); - pathPercent += 0.1; - if(pathPercent > 0.9) - snippets[i]->setOpacity(0.0); - else - snippets[i]->setOpacity(1.0); - } - } - if(start == 0){ - m_snippet->updateChildGeometries(); // Make sure we go back to original state - } - } else { - QTransform transform; - transform.translate(m_path->pointAtPercent(start).x(), m_path->pointAtPercent(start).y()); - m_snippet->setTransform(transform); - } - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/malstromanimator.h --- a/ginebra/animations/malstromanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_MALSTROM_ANIMATOR_H_ -#define _GINEBRA_MALSTROM_ANIMATOR_H_ - -#include <QObject> -#include "../visibilityanimator.h" - -class ChromeSnippet; -class QPainterPath; - -class MalstromAnimator : public VisibilityAnimator -{ - Q_OBJECT - - public: - MalstromAnimator(ChromeSnippet* snippet); - virtual ~MalstromAnimator(); - void setPath(QPainterPath* path); - public slots: - virtual void updateVisibility(qreal step); - - private: - QPainterPath* m_path; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/pulseanimator.cpp --- a/ginebra/animations/pulseanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "pulseanimator.h" -#include "../chromesnippet.h" -#include "QTransform" - -PulseAnimator::PulseAnimator(ChromeSnippet* m_snippet) - : AttentionAnimator(m_snippet) -{ - m_timeLine = new QTimeLine(1500); //Default to 1 sec - m_timeLine->setLoopCount(5); - m_timeLine->setCurveShape(QTimeLine::SineCurve); - connect(m_timeLine, SIGNAL(valueChanged(qreal)), - this, SLOT(updateAttention(qreal))); - -} - -PulseAnimator::~PulseAnimator() -{ -} - -void PulseAnimator::updateAttention(qreal step) -{ -#ifdef Q_OS_SYMBIAN - if(step < 0.1) step = 1.0; - m_snippet->setOpacity(step); -#else - QTransform t, m, b; - step = step/2+ 0.5; - if(step < 0.55) step = 1.0; - m.translate(18,18); - t.scale(step, step); - b.translate(-18,-18); - m_snippet->setTransform(b*t*m); -#endif -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/pulseanimator.h --- a/ginebra/animations/pulseanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_PULSE_ANIMATOR_H_ -#define _GINEBRA_PULSE_ANIMATOR_H_ - -#include <QObject> -#include "../attentionanimator.h" - -class QObject; -class ChromeSnippet; - -class PulseAnimator : public AttentionAnimator -{ - Q_OBJECT - - public: - PulseAnimator(ChromeSnippet* snippet); - void toggleActive(); - virtual ~PulseAnimator(); - public slots: - virtual void updateAttention(qreal step); -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/slideanimator.cpp --- a/ginebra/animations/slideanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#include "slideanimator.h" -#include "../chromesnippet.h" -#include <QList> - -SlideAnimator::SlideAnimator(ChromeSnippet* snippet) - : VisibilityAnimator(snippet), - m_snippet(snippet), - m_direction(slideUp) -{ - QPointF pos = snippet->pos(); - if(snippet->anchor() == "AnchorBottom"){ - m_direction = slideDown; - m_visiblePosition = pos.y(); - m_invisiblePosition = m_visiblePosition + snippet->geometry().height() + snippet->anchorOffset(); - } - else if(snippet->anchor() == "AnchorLeft"){ - m_direction = slideLeft; - m_visiblePosition = pos.x(); - m_invisiblePosition = m_visiblePosition - snippet->geometry().width() - snippet->anchorOffset(); - } - else if (snippet->anchor() == "AnchorRight"){ - m_direction = slideRight; - m_visiblePosition = pos.x(); - m_invisiblePosition = m_visiblePosition + snippet->geometry().width() + snippet->anchorOffset(); - } - else { - m_visiblePosition = pos.y(); - m_invisiblePosition = m_visiblePosition - snippet->geometry().height() - snippet->anchorOffset(); - } - m_moveBy = m_invisiblePosition - m_visiblePosition; -} - -SlideAnimator::~SlideAnimator() -{ -} - -void SlideAnimator::updateVisibility(qreal step) -{ - qreal p = step*m_moveBy + m_visiblePosition; - if((m_direction == slideDown) || (m_direction == slideUp)){ - if(step < 0.05){ - m_snippet->setPos(m_snippet->pos().x(), m_visiblePosition); - } - else if(step > 0.95){ - m_snippet->setPos(m_snippet->pos().x(), m_invisiblePosition); - } - else{ - m_snippet->setPos(m_snippet->pos().x(), p); - } - } - else { - if(step < 0.05){ - m_snippet->setPos(m_visiblePosition, m_snippet->pos().y()); - } - else if(step > 0.95){ - m_snippet->setPos(m_invisiblePosition, m_snippet->pos().y()); - } - else{ - m_snippet->setPos(p,m_snippet->pos().y()); - } - } -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/animations/slideanimator.h --- a/ginebra/animations/slideanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef _GINEBRA_SLIDE_ANIMATOR_H_ -#define _GINEBRA_SLIDE_ANIMATOR_H_ - -#include <QObject> -#include "../visibilityanimator.h" - -class ChromeSnippet; -class QPainterPath; - -class SlideAnimator : public VisibilityAnimator -{ - Q_OBJECT - enum direction { - slideUp, - slideDown, - slideLeft, - slideRight - }; - public: - SlideAnimator(ChromeSnippet* snippet); - virtual ~SlideAnimator(); - public slots: - virtual void updateVisibility(qreal step); - private: - ChromeSnippet * m_snippet; - direction m_direction; - qreal m_visiblePosition; - qreal m_invisiblePosition; - qreal m_moveBy; -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/attentionanimator.cpp --- a/ginebra/attentionanimator.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "attentionanimator.h" -#include <QTimeLine> -// NB: These go away when plugins are implemented -#include "animations/bounceanimator.h" -#include "animations/pulseanimator.h" - -AttentionAnimator::~AttentionAnimator(){ - delete m_timeLine; -} - -//NB: Replace implementation with hash table populated by plugin discovery - -AttentionAnimator * AttentionAnimator:: create(const QString & name, ChromeSnippet* snippet){ - if(name.compare("G_ATTENTION_BOUNCE_ANIMATOR") == 0){ - return new BounceAnimator(snippet); - } - if(name.compare("G_ATTENTION_PULSE_ANIMATOR") == 0){ - return new PulseAnimator(snippet); - } - return 0; -} - - -void AttentionAnimator::toggleActive(){ - if(!m_timeLine) { - m_timeLine = new QTimeLine(1000); //Default to 1 sec - m_timeLine->setLoopCount(3); - m_timeLine->setCurveShape(QTimeLine::SineCurve); - connect(m_timeLine, SIGNAL(valueChanged(qreal)), - this, SLOT(updateAttention(qreal))); - } - - m_timeLine->start(); - /* - if(m_active) { - m_active = false; - m_timeLine->stop(); - } - else { - m_active = true; - m_timeLine->start(); - }*/ -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/attentionanimator.h --- a/ginebra/attentionanimator.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef _GINEBRA_ATTENTION_ANIMATOR_H_ -#define _GINEBRA_ATTENTION_ANIMATOR_H_ - -#include <QObject> - -class ChromeSnippet; -class QTimeLine; - -/** - * \brief Base class for attention animation delegates - * - * \sa ChromeSnippet::setAttentionAnimator() - */ -class AttentionAnimator : public QObject -{ - Q_OBJECT - - public: - AttentionAnimator(ChromeSnippet* snippet):m_snippet(snippet), m_active(false), m_timeLine(0){} - static AttentionAnimator * create(const QString & name, ChromeSnippet* snippet); //Factory method - void toggleActive(); //NB: make this a slot? - virtual ~AttentionAnimator(); - void setTimeline(QTimeLine * timeline){m_timeLine = timeline;} - public slots: - virtual void updateAttention(qreal step) = 0; - - protected: - ChromeSnippet* m_snippet; - bool m_active; - QTimeLine *m_timeLine; - -}; - -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/browserIcon.svg --- a/ginebra/browserIcon.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="360px" height="359.998px" viewBox="0 0 360 359.998" enable-background="new 0 0 360 359.998" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="265.7617" y1="373.2383" x2="279.6634" y2="356.5287" gradientTransform="matrix(6.8182 0 0 -6.8182 -1679.8633 2666.5759)"> - <stop offset="0" style="stop-color:#DEE9F3"/> - <stop offset="1" style="stop-color:#235487"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="180" cy="179.28" r="126.802"/> -<radialGradient id="SVGID_2_" cx="276.3203" cy="376.373" r="33.1878" gradientTransform="matrix(6.8182 0 0 -6.8182 -1679.8633 2666.5759)" gradientUnits="userSpaceOnUse"> - <stop offset="0" style="stop-color:#FFFFFF"/> - <stop offset="0.53" style="stop-color:#A2C2DD"/> - <stop offset="0.87" style="stop-color:#6C83BB"/> - <stop offset="1" style="stop-color:#003D6D"/> -</radialGradient> -<circle fill="url(#SVGID_2_)" cx="180" cy="179.27" r="122.318"/> -<radialGradient id="SVGID_3_" cx="276.5664" cy="374.542" r="22.5763" gradientTransform="matrix(6.8182 0 0 -6.8182 -1679.8633 2666.5759)" gradientUnits="userSpaceOnUse"> - <stop offset="0" style="stop-color:#E6EEF4"/> - <stop offset="0.08" style="stop-color:#C6DCC1"/> - <stop offset="0.21" style="stop-color:#91C06F"/> - <stop offset="0.32" style="stop-color:#6BAB33"/> - <stop offset="0.4" style="stop-color:#539E0E"/> - <stop offset="0.44" style="stop-color:#4A9900"/> - <stop offset="0.55" style="stop-color:#398419"/> - <stop offset="0.71" style="stop-color:#22663B"/> - <stop offset="0.85" style="stop-color:#135550"/> - <stop offset="0.94" style="stop-color:#0E4E58"/> -</radialGradient> -<path fill="url(#SVGID_3_)" d="M241.449,221.041l-7.838,7.84c0,0-4.721,0-4.954,1.896c-0.104,0.807-0.394,4.314-1.165,6.104 - c-1.567,1.096-3.453,4.701-3.453,4.701s-0.965,6.984,4.234,5.803c5.197-1.184,13.881-15.943,13.881-15.943 - S247.357,219.863,241.449,221.041z M60.795,179.49l-3.093-1.035c0,0.278-0.021,0.554-0.021,0.83c0,2.932,0.139,5.824,0.34,8.699 - c0.041,0.609,0.086,1.23,0.139,1.838c0.245,2.873,0.564,5.725,1.006,8.543c0.018,0.113,0.045,0.236,0.062,0.354 - c0.445,2.793,1.002,5.537,1.636,8.268c0.09,0.404,0.18,0.801,0.278,1.207c0.687,2.83,1.459,5.641,2.344,8.396 - c0.008,0.029,0.021,0.059,0.027,0.088c0.09-0.998,0.135-2.021,0.1-3.076c-0.238-7.285-1.412-6.35-1.412-6.35l1.881-1.416 - l6.354-9.645v-7.057l-5.883-4.943L60.795,179.49z M139.635,69.933c1.55,1.063,3.888,1.804,5.262,1.215 - c1.375-0.585,4.319-2.716,4.319-2.716s-1.784-0.225-3.56,0.455C143.874,69.577,140.92,68.985,139.635,69.933z M299.958,155.363 - c-0.47-2.389-1.015-4.758-1.62-7.098c-0.113-0.441-0.258-0.875-0.376-1.312c-0.512-1.877-1.077-3.744-1.669-5.584 - c-0.238-0.717-0.475-1.432-0.729-2.145c-0.572-1.648-1.182-3.275-1.816-4.895c-0.249-0.629-0.486-1.271-0.748-1.894 - c-0.893-2.147-1.829-4.271-2.84-6.353c-0.204-0.422-0.43-0.83-0.639-1.248c-0.83-1.678-1.701-3.331-2.612-4.963 - c-0.401-0.721-0.813-1.437-1.236-2.148c-0.793-1.363-1.62-2.708-2.467-4.034c-0.429-0.684-0.862-1.366-1.306-2.042 - c-1.193-1.792-2.426-3.562-3.709-5.29c-0.319-0.43-0.65-0.847-0.977-1.269c-1.134-1.48-2.295-2.933-3.488-4.356 - c-0.572-0.675-1.147-1.333-1.729-1.996c-0.974-1.109-1.963-2.201-2.981-3.276c-0.613-0.65-1.224-1.301-1.845-1.939 - c-1.248-1.264-2.517-2.491-3.812-3.698c-0.537-0.5-1.063-1.002-1.607-1.489c-1.488-1.342-3.011-2.643-4.564-3.907 - c-0.707-0.573-1.429-1.125-2.137-1.686c-1.125-0.875-2.273-1.738-3.432-2.573c-0.771-0.556-1.538-1.112-2.312-1.648 - c-1.305-0.9-2.643-1.768-3.986-2.619c-0.612-0.393-1.221-0.802-1.838-1.183c-1.869-1.137-3.771-2.213-5.707-3.252 - c-0.803-0.43-1.619-0.835-2.438-1.248c-1.279-0.65-2.562-1.28-3.855-1.886c-0.896-0.412-1.793-0.822-2.688-1.215 - c-1.374-0.597-2.766-1.162-4.16-1.706c-0.63-0.246-1.257-0.507-1.887-0.745c-1.292,0.847-8.864,5.134-8.864,5.134 - s-7.784-1.35-9.921-1.35c-2.132,0-10.486-1.493-12.383-1.726c-1.902-0.241-8.902-1.182-11.021,0.94 - c-2.132,2.131-10.442,4.308-12.348,4.545c-1.881,0.241-5.801,1.255-1.1,7.056c-0.696,0.712-14.109,10.06-14.109,5.801 - c0-4.25,2.99-11.855-1.215-7.78c-3.021,2.925-7.817,1.183-5.215,4.492c2.602,3.318,0.393,2.397,0,3.142 - c-0.995,1.885-1.597,2.798-0.88,8.238c0.708,5.433-8.686,5.4-9.312,3.997c-1.677-3.772-5.67,1.878-6.615,3.31 - c-0.943,1.416-4.36,5.163-4.36,5.163l3.919,5.021l-11.447,10.034c0,0-15.917,11.042-16.149,12.466 - c-0.242,1.414-7.069,19.727-4.705,25.166c2.364,5.44,8.341,19.171,14,19.627c7.408,0.604,25.399-3.397,25.399-3.397 - c0.479,1.189,3.649,5.885,3.649,5.885s9.041,1.055,9.526,2c0.164,0.336-4.536,9.475-1.645,13.52 - c6.271,8.783,12.269,17.57,8.82,21.646c-8.235,12.359-0.356,16.109,1.644,22.586c0.716,1.895,3.056,7.838,6.665,13.955 - c3.608,10.506,5.92,5.801,10.661,7.531c5.841,0.51,10.759,2.654,15.721-3.725c1.438-1.174,3.883-0.236,3.883-1.887 - c0-0.936,4.234-3.648,5.317-6.186c1.149-0.523,4.091-2.52,6.092-3.469c1.81-0.117-1.729-4.98,1.882-10.121 - c3.874-1.523,14.348-8.582,14.348-8.582c0.473-10.346-5.098-23.131,5.293-30.465c6.707-6.812,15.488-10.705,19.752-21.107 - c1.18-3.069,3.82-9.356-3.756-7.471c-7.117,1.793-15.056,2.197-11.291-0.937c-0.426-3.838-5.18-5.649-9.412-9.414 - c-2.195-5.18-5.647-14.43-5.647-14.43l-7.526-11.441l0.939-2.356l8.941,13.177l8.94,10.819c3.293,10.82,6.112,11.763,6.112,11.763 - c4.954-1.742,16.699-6.582,16.699-6.582l11.521-11.06c0,0-1.17-3.521-5.878-7.998l-3.527-2.119 - c-0.771,2.166-4.861,2.983-4.861,2.983l-2.662-3.923l-3.525-3.997l-3.77-3.998l3.703-0.752l2.851,5.433l6.856,2.373 - c0,0,1.896-1.391,5.416,2.246c2.867-0.231,8.931,0.577,8.931,0.577s5.146-0.024,7.762,3.294c0.503,0.646,1.231,3.698,2.196,4.394 - c3.293,2.35,6.042,6.983,8.619,15.836c1.511,5.18,3.056,13.8,5.689,13.841c1.143,0.017,1.99,0.471,1.605-1.55 - c-0.467-0.941-1.176-10.875-1.176-10.875s1.176-11.032,1.885-15.524c1.791-3.814,2.086,0.008,6.354,7.286 - C299.999,155.605,299.982,155.488,299.958,155.363z M182.332,74.265c0.939-2.782,6.357-3.731,6.357-3.731s-1.558,2.868-1.194,4.353 - c0.362,1.493-2.472,2.446-2.798,5.952c-0.295,3.505-6.779,1.452-7.319,0.225C176.863,79.833,181.383,77.049,182.332,74.265z - M205.536,121.613c-4.011,0-16.054,1.19-19.362-1.174c-3.311-2.355-5.883,0.241-8.269,2.605c-1.562,1.542-7.249-1.575-8.906-3.939 - c-1.656-2.365-7.213-2.189-7.213-2.189l1.256-6.74l-15.996-0.782l-9.098,2.66l-8.563,0.257l4.799-2.295l5.96-1.416 - c0,0,8.689-7.126,11.291-9.254c2.206-1.796,10.98-0.781,10.98-0.781l9.642,6.959c0,0-2.131,5.441-3.08,6.615 - c3.539-0.241,7.708-6.672,7.708-6.672c-7.527-6.905-7.216-9.254-7.216-9.254l9.912,6.951l0.09,0.065c0,0,4.009,9.454,5.679,9.454 - c1.65,0,3.76-6.512,3.76-6.512l2.826-0.704c1.257,2.982,3.606,9.725,6.423,8.148c1.62-0.896,4.309-0.082,7.377,1.104 - c3.08,1.174,5.18-0.63,7.687,1.567C212.907,126.013,207.195,122.089,205.536,121.613z M211.836,105.341 - c-4.152-1.575-9.368-0.937-9.368-0.937c-1.792,1.661-8.741-0.208-5.629-3.898c3.112-3.682,5.956-5.465,7.416-2.455 - c0.377,1.231,5.037,3.15,5.013,0.544c-0.041-2.614,4.666-3.997,5.358-2.054c-2.513,1.804,0.144,3.301,2.017,4.316 - C221.907,103.724,224.451,107.763,211.836,105.341z M238.165,113.289c-2.288-1.846,1.034-3.429-2.345-6.321 - c-4.854-4.148-8.615-5.936-2.014-9.29c8.125-1.023,1.311,2.589,2.658,4.762c0.723,1.158,4.844,5.027,8.047,9.773 - C247.173,116.156,240.443,115.125,238.165,113.289z M122.188,74.809c2.603-0.233,9.394-6.128,12.939-4.938 - c3.555,1.174,6.472-1.207,9.781-3.326c1.178-0.241,2.831,0.462,5.683-0.957c2.839-1.415,8.509-4.484,9.924-4.484 - s6.138-0.176,7.311-2.062c0,0,3.525,0.471,5.646,0.711c2.93,0.319,14.731,2.827,17.801,1.645c1.69-0.65,8.781-1.224,14.84-1.608 - c-0.277-0.061-0.562-0.135-0.846-0.196c-0.813-0.172-1.646-0.315-2.473-0.47c-1.279-0.241-2.562-0.487-3.857-0.688 - c-0.562-0.086-1.125-0.151-1.691-0.233c-1.566-0.221-3.135-0.438-4.713-0.597c-0.055-0.004-0.1-0.004-0.151-0.013 - c-4.065-0.409-8.198-0.622-12.367-0.622c-0.846,0-1.677,0.045-2.515,0.065c-1.555,0.032-3.11,0.074-4.651,0.164 - c-1.203,0.069-2.396,0.167-3.588,0.274c-1.346,0.115-2.679,0.257-4.012,0.421c-1.146,0.139-2.295,0.266-3.434,0.434 - c-2.185,0.327-4.348,0.7-6.491,1.141c-1.047,0.212-2.074,0.479-3.109,0.716c-1.358,0.315-2.708,0.642-4.045,1.002 - c-1.102,0.294-2.189,0.602-3.277,0.928c-1.357,0.409-2.704,0.847-4.041,1.301c-0.944,0.319-1.905,0.617-2.844,0.961 - c-2.045,0.749-4.066,1.559-6.059,2.414c-0.971,0.417-1.924,0.863-2.885,1.301c-1.243,0.573-2.475,1.158-3.693,1.772 - c-0.966,0.482-1.932,0.965-2.88,1.473c-1.411,0.752-2.798,1.546-4.173,2.352c-0.586,0.339-1.179,0.662-1.756,1.01 - C117.086,75.674,118.755,75.898,122.188,74.809z"/> -<rect y="-0.72" fill="none" width="360" height="360"/> -<text transform="matrix(1 0 0 1 92.7012 242.8828)" fill="#FFFFFF" font-family="'TrebuchetMS'" font-size="63.3535">ALPHA</text> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/chrome.css --- a/ginebra/chrome/bedrockchrome/chrome.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* place overall style hooks here */ -@import url("toolbar2.snippet/toolbar.css"); - -body { - margin:0px; - -webkit-user-select:none; -} - -#StatusBarChromeId { - height: 26px; -} - -#UrlSearchChromeId { -// height: 34px; - height: 44px; -} - -/* -#ToolbarChromeId { - height: 50px; -} -*/ - -#WindowCountBarId { - height: 26px; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/chrome.html --- a/ginebra/chrome/bedrockchrome/chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -<html> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link rel="stylesheet" id="CSSLink" type="text/css" href="download.snippet/download.css"> - <link rel="stylesheet" id="CSSLink" type="text/css" href="contextmenu.snippet/contextmenu.css"/> - <link rel="stylesheet" id="CSSLink" type="text/css" href="contextmenu.snippet/contextmenubg.css"/> - <link rel="stylesheet" id="CSSLink" type="text/css" href="suggests.snippet/suggests.css"/> - <link rel="stylesheet" id="CSSLink" type="text/css" href="chrome.css"/> - <head> -  -  - <script src="../js/Bind.js" type="text/javascript"></script> - <script src="../js/ActionButton.js" type="text/javascript"></script> - <script src="../js/SimpleButton.js" type="text/javascript"></script> - <script src="../js/3rdparty/jquery-1.3.1.min.js" type="text/javascript"></script> - <script src="../js/ContextMenu.js" type="text/javascript"></script> - <script src="../js/ContextMenuBg.js" type="text/javascript"></script> - <script src="../js/SearchSuggest.js" type="text/javascript"></script> - <script src="windowcount.snippet/windowcount.js" type="text/javascript"></script> - <script src="statusbar.snippet/statusbar.js" type="text/javascript"></script> - <script src="urlsearch.snippet/urlsearch.js" type="text/javascript"></script> - <script src="toolbar2.snippet/toolbar.js" type="text/javascript"></script> - <script src="contextmenu.snippet/contextmenu.js" type="text/javascript"></script> - <script src="contextmenu.snippet/contextmenubg.js" type="text/javascript"></script> - <script src="suggests.snippet/suggests.js" type="text/javascript"></script> - <script src="download.snippet/download.js" type="text/javascript"></script> - <script src="zoombar.snippet/zoombar.js" type="text/javascript"></script> - </head> - - - - <body onload="window.chrome.loadFromHistory();" ondragstart="return false;"> - - <div class ="InitialChrome"> - <div class = "GinebraSnippet" id="StatusBarChromeId" name="statusbar" data-GinebraAnchor="AnchorTop" data-GinebraVisible="true"> - <link rel="stylesheet" id="CSSLink" type="text/css" href="statusbar.snippet/statusbar.css"/> - <script type="text/javascript"> - statusbar = new StatusBar(); - </script> - </div> - - <div class = "GinebraSnippet" id="WindowCountBarId" name="wcbar" data-GinebraVisible="false"> - <link rel="stylesheet" id="CSSLink" type="text/css" href="windowcount.snippet/windowcount.css"/> - <script type="text/javascript"> - wcbar = new WindowCountBar('WindowCountBarId'); - </script> - </div> - - <div class = "GinebraSnippet" id="UrlSearchChromeId" name="urlsearch" data-GinebraAnchor="AnchorTop" data-GinebraAnchorOffset="27" data-GinebraVisible="true"> - <link rel="stylesheet" id="CSSLink" type="text/css" href="urlsearch.snippet/urlsearch.css"/> - <script type="text/javascript"> - var lastUrl = window.chrome.getLastUrl(); - urlsearch = new UrlSearch(lastUrl); - </script> - </div> - - - - <div class = "GinebraSnippet ToolBar" id="WebViewToolbarId" name="toolbar" data-GinebraAnchor="AnchorBottom" data-GinebraVisible="true" data-GinebraHidesContent="true"> -  - <script type="text/javascript"> - toolbar = new WebViewToolbar(); - </script> - </div> - - <div class = "GinebraSnippet ToolBar" id="HistoryViewToolbarId" name="toolbar" data-GinebraAnchor="AnchorBottom" data-GinebraVisible="false"> - <script type="text/javascript"> - hvToolbar = new HistoryViewToolbar(); - </script> - </div> - - <div class = "GinebraSnippet ToolBar" id="BookmarkViewToolbarId" name="toolbar" data-GinebraAnchor="AnchorBottom" data-GinebraVisible="false"> - <script type="text/javascript"> - bvToolbar = new BookmarkViewToolbar(); - </script> - </div> - - <div class = "GinebraSnippet ToolBar" id="BookmarkHistoryViewToolbarId" name="toolbar" data-GinebraAnchor="AnchorBottom" data-GinebraVisible="false"> - <script type="text/javascript"> - bhvToolbar = new BookmarkHistoryViewToolbar(); - </script> - </div> - - <div class = "GinebraSnippet ToolBar" id="WindowViewToolbarId" name="toolbar" data-GinebraAnchor="AnchorBottom" data-GinebraVisible="false"> - <script type="text/javascript"> - wvToolbar = new WindowViewToolbar(); - </script> - </div> - - <div class = "GinebraSnippet Suggests" id="SuggestsId" style="height:50%; width:98%;" name="toolbar" data-GinebraVisible="false"> - <script type="text/javascript"> - searchSuggests = new Suggests(); - </script> - </div> - - - - <div class = "GinebraSnippet ContextMenu" id="ContextMenuId" style="height:91; width:193;" name="toolbar" data-GinebraVisible="false"> - <script type="text/javascript"> - wvToolbar = new ContextMenu(); - </script> - </div> - - <div class = "GinebraSnippet ContextMenuBg" id="ContextMenuBgId" style="height:600; width:600; opacity:0.0" name="toolbar" data-GinebraVisible="false"> - <script type="text/javascript"> - wvToolbar = new ContextMenuBg(); - </script> - </div> - - </div> - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenu.css --- a/ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenu.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ - -.ContextMenu {font-family:Verdana;font-size:32px;color:#222;background-color:transparent} -a.ContextMenu {color:#ccc;text-decoration:none;} -a.ContextMenu:hover {color:#ccc;text-decoration:none} - -#tabMenu {margin-left:1px;padding:0 0 0 0px;list-style:none;} -#tabMenu li { - float:left; - height:20px; - width:44px; - cursor:pointer; - cursor:hand; - text-align: center; - -webkit-border-top-right-radius: 5px; - -webkit-border-top-left-radius: 5px; - border: 1px solid #000; - border-bottom: 0px; - margin-left: -1px; - padding: 4px; - padding-top: 2px; - padding-bottom: 1px; - background-color: #555; - color: #eee; -} - -#tabMenu li.mouseover {} -#tabMenu li.mouseout {} -#tabMenu li.selected {background-color: #ddd; color: #222} - -.box {width:193px} -.boxTop {height:0px;clear:both} -.boxBody {background-color:#eee;} -.boxBottom {height:0px;} - -.boxBody div {display:none;} -.boxBody div.show {display:block;} - -.boxBody div ul { - margin:0 0px 0 0px; - padding:0; - list-style: none; - border-bottom: 1px solid #222; - border-left: 1px solid #222; - border-right: 1px solid #222; - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#445b7c), - color-stop(100%,#303f57)); - color:#fff; - text-align: center; -} -*html .boxBody div ul {margin-left:10px;padding-left:15px} -.boxBody div li {border-top:1px solid #222; margin: 0px; padding:4px 0;cursor:hand;cursor:pointer;} -.boxBody div ul li.last {border-bottom:none;} \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenu.js --- a/ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenu.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -function printProp(x) { - window.chrome.alert(x + ":"); - for (property in x) { - window.chrome.alert(property + ": " + x[property]); - } -} - -window.webView.contextEvent.connect( - function(e) { - window.chrome.alert("web context22222222222: " + e + " " + e.pos.x); - window.snippets.ContextMenuId.show(); - } -); - -window.historyView.contextEvent.connect( - function(e) { - window.chrome.alert("history context: " + e + " " + e.itemIndex + - " x=" + e.pos.x + " y=" + e.pos.y); - printProp(e); - } -); - -window.chrome.loadComplete.connect( - -); - -function ContextMenu() -{ - // attach internal funcs - this.write = writeContextMenu; - - // do setup - this.write(); -} - -function goToRecentUrlView () { - window.viewStack.switchView("bookmarkHistoryView", "webView"); - } - -function goToBookmarkView () { - window.viewStack.switchView("bookmarkTreeView", "webView"); - } - -// "Private" methods -function writeContextMenu() { - var html = - '<div class="box">' + - - - '<div class="boxBody">' + - - '<div id="Settings" class="show">' + - '<ul>' + - '<li onmouseup="goToBookmarkView();">' + window.localeDelegate.translateText("bookmarks_bookmarks") + '</li>' + - '<li onmouseup="goToRecentUrlView();">'+ window.localeDelegate.translateText("content_view_menu_history") + '</li>' + -// '<li onmouseup="window.chrome.clearCache(); window.chrome.clearCookies();window.chrome.clearHistory();">' + window.localeDelegate.translateText("settings_clear_all") + '</li>' + - '</ul>' + - '</div>' + - '</div>' + - '</div>'; - document.write(html); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenubg.css --- a/ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenubg.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ - -.ContextMenuBg {font-family:Verdana;font-size:32px;color:#222;background-color:transparent} -a.ContextMenuBg {color:#ccc;text-decoration:none;} -a.ContextMenuBg:hover {color:#ccc;text-decoration:none} - -#tabMenu {margin-left:1px;padding:0 0 0 0px;list-style:none;} -#tabMenu li { - float:left; - height:20px; - width:44px; - cursor:pointer; - cursor:hand; - text-align: center; - -webkit-border-top-right-radius: 5px; - -webkit-border-top-left-radius: 5px; - border: 1px solid #000; - border-bottom: 0px; - margin-left: -1px; - padding: 4px; - padding-top: 2px; - padding-bottom: 1px; - background-color: #555; - color: #eee; -} - -#tabMenu li.mouseover {} -#tabMenu li.mouseout {} -#tabMenu li.selected {background-color: #ddd; color: #222} - -.box {width:193px} -.boxTop {height:0px;clear:both} -.boxBody {background-color:#eee;} -.boxBottom {height:0px;} - -.boxBody div {display:none;} -.boxBody div.show {display:block;} - -.boxBody div ul { - margin:0 0px 0 0px; - padding:0; - list-style: none; - border-bottom: 1px solid #222; - border-left: 1px solid #222; - border-right: 1px solid #222; - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#445b7c), - color-stop(100%,#303f57)); - color:#fff; - text-align: center; -} -*html .boxBody div ul {margin-left:10px;padding-left:15px} -.boxBody div li {border-top:1px solid #222; margin: 0px; padding:4px 0;cursor:hand;cursor:pointer;} -.boxBody div ul li.last {border-bottom:none;} \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenubg.js --- a/ginebra/chrome/bedrockchrome/contextmenu.snippet/contextmenubg.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -function printProp(x) { - window.chrome.alert(x + ":"); - for (property in x) { - window.chrome.alert(property + ": " + x[property]); - } -} - -window.webView.contextEvent.connect( - function(e) { - window.chrome.alert("web context22222222222: " + e + " " + e.pos.x); - window.snippets.ContextMenuBgId.show(); - } -); - -window.historyView.contextEvent.connect( - function(e) { - window.chrome.alert("history context: " + e + " " + e.itemIndex + - " x=" + e.pos.x + " y=" + e.pos.y); - printProp(e); - } -); - -window.chrome.loadComplete.connect( - -); - -function ContextMenuBg() -{ - // attach internal funcs - this.write = writeContextMenuBg; - - // do setup - this.write(); -} - -function goToRecentUrlView () { - window.viewStack.switchView("bookmarkHistoryView", "webView"); - } - -function goToBookmarkView () { - window.viewStack.switchView("bookmarkTreeView", "webView"); - } - -// "Private" methods -function writeContextMenuBg() { - var html = - '<div class="box">' + - - - '<div class="boxBody">' + - - '<div id="Settings" class="show">' + - '<ul>' + - '<li onmouseup="goToBookmarkView();">' + window.localeDelegate.translateText("bookmarks_bookmarks") + '</li>' + - '<li onmouseup="goToRecentUrlView();">'+ window.localeDelegate.translateText("content_view_menu_history") + '</li>' + -// '<li onmouseup="window.chrome.clearCache(); window.chrome.clearCookies();window.chrome.clearHistory();">' + window.localeDelegate.translateText("settings_clear_all") + '</li>' + - '</ul>' + - '</div>' + - '</div>' + - '</div>'; - document.write(html); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/download.snippet/download.css --- a/ginebra/chrome/bedrockchrome/download.snippet/download.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* css for download progress */ - -.Download { - color: black; - background-color: white; - border-style: solid; - border-width: thin; -} - -.DownloadFile { - font-family: arial; - font-size: 14px; - margin: 5px; - height: 20px; - width: 100%; - color: black; - background-color: white; -} - -.DownloadError { - font-family: arial; - font-size: 14px; - margin: 5px; - height: 20px; - width: 100%; - color: red; - background-color: white; -} - -.DownloadMeter { - margin: 5px; - height: 20px; - background-color: #CCCCFF; - border-style: solid; - border-width: thin; -} - -.DownloadProgress { - height: 18px; - border-top: solid 2px #0077DD; - background-color: #004080; - float: left; -} - -.DownloadCounter { - font-family: arial; - font-size: 14px; - position: relative; - top: 0px; - color: black; - /* background-color: white; */ -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/download.snippet/download.js --- a/ginebra/chrome/bedrockchrome/download.snippet/download.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,229 +0,0 @@ -/* js for download progress */ - -var debugDownloadSignals = true; - -// Generate HTML to populate download DIV element. - -function downloadProgressHTML() -{ - var html = - '<div class="DownloadFile" id="DownloadFile"></div>' + - '<div class="DownloadMeter" id="DownloadMeter" style="width: 200px">' + - '<div class="DownloadProgress" id="DownloadProgress" style="width: 0px"></div>' + - '<div class="DownloadCounter" id="DownloadCounter" style="left: 210px"></div>' + - '</div>'; - - // FIXME ;;; replace form with pure div/css button - - html += - '<form name="DownloadForm" action="">' + - '<input type="button" name="DownloadButton" value="Clear" ' + - 'onClick="window.snippets.DownloadId.hide();">' + - '</form>'; - - return html; -} - -function downloadErrorHTML(file, error) -{ - var html = - '<div class="DownloadFile" id="DownloadFile">' + file + '</div>' + - '<div class="DownloadError" id="DownloadError">ERROR: ' + error + '</div>'; - - return html; -} - -function writeDownloadEmpty() -{ - document.write(downloadProgressHTML()); -} - -// Initialize download DIV. - -function Download() -{ - this.write = writeDownloadEmpty; - - this.write(); -} - -// Update HTML. - -function setDownloadHTML(html) -{ - var dlElem = document.getElementById("DownloadId"); - dlElem.innerHTML = html; -} - -function setDownloadFile(file) -{ - var dlFile = document.getElementById("DownloadFile"); - dlFile.innerHTML = file; -} - -function setDownloadPercent(percent) -{ - var outer = document.getElementById("DownloadMeter"); - var inner = document.getElementById("DownloadProgress"); - var counter = document.getElementById("DownloadCounter"); - - var outerWidthStyle = outer.style.width; - var innerWidthStyle = inner.style.width; - var counterLeftStyle = counter.style.left; - - var outerWidthNum = parseInt(outerWidthStyle); - var innerWidthNum = parseInt(innerWidthStyle); - var counterLeftNum = parseInt(counterLeftStyle); - - innerWidthNum = Math.floor(outerWidthNum * percent / 100.0); - innerWidthStyle = innerWidthStyle.replace(/^\d+/, innerWidthNum); - - counterLeftNum = outerWidthNum + 10 - innerWidthNum; - counterLeftStyle = counterLeftStyle.replace(/^\d+/, counterLeftNum); - - inner.style.width = innerWidthStyle; - counter.style.left = counterLeftStyle; - counter.style.width = "" + (innerWidthNum + 50) + "px"; - - counter.innerHTML = "" + percent + "%"; -} - -function setDownloadSize(size, sofar, percent) -{ - if (size >= 0) { - setDownloadPercent(percent); - } else { - var counter = document.getElementById("DownloadCounter"); - counter.innerHTML = "" + sofar + " bytes"; - } -} - -// Connect to relevant ChromeJSObject signals. - -window.chrome.onDownloadCreated.connect( - function(id) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadCreated"); - window.chrome.alert("id=" + id); - } - window.snippets.DownloadId.show(); - setDownloadHTML(downloadProgressHTML()); - } -); - -window.chrome.onDownloadStarted.connect( - function(id, file, size) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadStarted"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - } - setDownloadFile(file); - } -); - -window.chrome.onDownloadProgress.connect( - function(id, file, size, sofar, percent) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadProgress"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - } - setDownloadFile(file); - setDownloadSize(size, sofar, percent); - } -); - -window.chrome.onDownloadFinished.connect( - function(id, file, size, sofar, percent) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadFinished"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - } - setDownloadFile(file); - setDownloadSize(size, sofar, percent); - } -); - -window.chrome.onDownloadPaused.connect( - function(id, file, size, sofar, percent, error) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadPaused"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - window.chrome.alert("error=" + error); - } - setDownloadHTML(downloadErrorHTML(file, error)); - } -); - -window.chrome.onDownloadCancelled.connect( - function(id, file, size, sofar, percent, error) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadCancelled"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - window.chrome.alert("error=" + error); - } - setDownloadHTML(downloadErrorHTML(file, error)); - } -); - -window.chrome.onDownloadFailed.connect( - function(id, file, size, sofar, percent, error) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadFailed"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - window.chrome.alert("error=" + error); - } - setDownloadHTML(downloadErrorHTML(file, error)); - } -); - -window.chrome.onDownloadNetworkLoss.connect( - function(id, file, size, sofar, percent, error) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadNetworkLoss"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - window.chrome.alert("error=" + error); - } - setDownloadHTML(downloadErrorHTML(file, error)); - } -); - -window.chrome.onDownloadError.connect( - function(id, file, size, sofar, percent, error) { - if (debugDownloadSignals) { - window.chrome.alert("JS received signal onDownloadError"); - window.chrome.alert("id=" + id); - window.chrome.alert("file=" + file); - window.chrome.alert("size=" + size); - window.chrome.alert("sofar=" + sofar); - window.chrome.alert("percent=" + percent); - window.chrome.alert("error=" + error); - } - setDownloadHTML(downloadErrorHTML(file, error)); - } -); diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt10.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt10.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100_charging.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100_charging.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt20.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt20.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt30.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt30.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt40.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt40.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt50.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt50.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt60.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt60.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt70.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt70.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt80.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt80.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt90.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/battery/batt90.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/lock.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/lock.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal0.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal0.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal100.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal100.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal25.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal25.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal50.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal50.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal75.png Binary file ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/signal75.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/svg_sig_convert.sh --- a/ginebra/chrome/bedrockchrome/statusbar.snippet/icons/signal/svg_sig_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -# icons -ICON_WIDTH=20 -ICON_HEIGHT=20 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/statusbar.css --- a/ginebra/chrome/bedrockchrome/statusbar.snippet/statusbar.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -#StatusBarChromeId { - /* background: black;*/ - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#000011), - color-stop(100%,#111122)); - overflow: hidden; - padding-right: 3px; - padding-left: 3px; -} - -#StatusBarChromeId table { - table-layout:fixed; - width: 100%; - border: 0; - border-spacing: 0; - padding: 0; - } - -#StatusBarChromeId tr { - font-size:16px; - color: #A9A9A9; - font-weight: bold; - overflow: hidden; -} - -#StatusBarChromeId td { - vertical-align: middle; - overflow: hidden; - border-spacing: 0; - padding: 0; - white-space: nowrap; -} - -#StatusBarChromeId td.leftalign { - text-align: left; -} - -#StatusBarChromeId td.rightalign { - text-align: right; -} - -#StatusBarChromeId td.centeralign { - text-align: center; -} - -#strength, #battery { - width: 24px; -} - -#lock { - width: 20px; -} - -#provider { - /* white to match signal strength icon */ - color: #FFFFFF; - font-size:12px; -} - -#clock { - width: 70; - white-space: nowrap; -} - -#title { - vertical-align: middle; - overflow: hidden; - height: 30px; - display: table-cell; - white-space: nowrap; -} - -#StatusBarChromeId td img { - width: 23px; - padding: 1; -} - -#ruler { - font-size:12px; - font-weight: bold; - visibility: hidden; -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/statusbar.snippet/statusbar.js --- a/ginebra/chrome/bedrockchrome/statusbar.snippet/statusbar.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,476 +0,0 @@ -/*! - \file statusbar.js This module contains the StatusBar class. -*/ - -/*! - Class to handle displaying and updating the status bar. Only 1 status bar - should be created for the browser. This class is not designed to be code - space efficient for creating multiple status bar objects. -*/ -function StatusBar() -{ - // Private Classes - - /*! - Class to handle updating the status bar title. Only 1 title should be - created for the browser status bar. This class is not designed to be code - space efficient for creating multiple title objects. - */ - function Title() - { - // Private Methods - - //! Changes the current title to the specified title. - /*! - \param title new title to display - \param doRepaint force immediate repaint if true - */ - function setTitle(title, doRepaint) - { - document.getElementById('title').innerHTML = title; - if (doRepaint) - window.snippets.StatusBarChromeId.repaint(); - } - - // Public Methods - - //! Handles title change signal. - /*! - \param title new title - */ - this.handleTitleChange = function(title) - { - if (window.viewManager.currentView.type == "webView") { - if (title != "") - setTitle(title, true); - } - } - - //! Handles title partial URL change signal. - /*! - \param partialUrl new title - */ - this.handlePartialUrlChange = function(partialUrl) - { - if (window.viewManager.currentView.type == "webView") - setTitle(partialUrl, true); - } - - //! Handles title update in response to current view change signal. - this.handleCurrentViewChange = function() - { - if (window.viewManager.currentView.type == "webView") { - /* For new windows, show title as 'New Window' */ - if ((window.pageController.currentDocTitle == "") && - (window.pageController.currentDocUrl == "")) - setTitle(window.localeDelegate.translateText("windows_new_window"), false); - else if (window.pageController.currentDocTitle == "") - setTitle(window.pageController.currentPartialUrl, false); - else - setTitle(window.pageController.currentDocTitle, false); - } - else { - if (window.viewManager.currentView.type == "bookmarkTreeView") - setTitle(window.localeDelegate.translateText("content_view_menu_bookmarks"), false); - else if (window.viewManager.currentView.type == "bookmarkHistoryView") - setTitle(window.localeDelegate.translateText("content_view_menu_history"), false); - else if (window.viewManager.currentView.type == "windowView") - setTitle(window.localeDelegate.translateText("windows_windows"), false); - } - } - } - - /*! - Class to handle updating the lock status (show/remove lock icon). Only 1 - LockStatus object should be created for the browser status bar. This class - is not designed to be code space efficient for creating multiple objects. - */ - function LockStatus() - { - // Private Member Variables - var secureIconSrc = "<img src=\"statusbar.snippet/icons/lock.png\">"; - var noIconSrc = " "; - - // Public Methods - - //! Shows lock icon in status bar if in webView. - this.showLockIcon = function() - { - if (window.viewManager.currentView.type == "webView") { - document.getElementById('lock').innerHTML = secureIconSrc; - window.snippets.StatusBarChromeId.repaint(); - } - } - - //! Removes lock icon from status bar. - this.removeLockIcon = function() - { - document.getElementById('lock').innerHTML = noIconSrc; - window.snippets.StatusBarChromeId.repaint(); - } - - //! Handles lock status update in response to current view change signal. - this.handleCurrentViewChange = function() - { - if (window.viewManager.currentView.type == "webView") { - /* Secure icon */ - if (window.pageController.secureState) - this.showLockIcon(); - else - this.removeLockIcon(); - } - else { - this.removeLockIcon(); - } - } - } - - /*! - Class to handle updating the clock time. Only 1 Clock object should be - created for the browser status bar. This class is not designed to be code - space efficient for creating multiple objects. - */ - function Clock() - { - // Public Methods - //! Updates the time displayed on the status bar. - this.showtime = function() - { - var now = new Date(); - var hours = now.getHours(); - var minutes = now.getMinutes(); - var timeValue = "" + ((hours > 12) ? hours - 12 : hours); - timeValue += ((minutes < 10) ? ":0" : ":") + minutes; - timeValue += (hours >=12) ? " pm": " am"; - document.getElementById('clock').innerHTML = timeValue; - } - } - - /*! - Class to handle updating the network status. Only 1 NetworkStatus object - should be created for the browser status bar. This class is not designed - to be code space efficient for creating multiple objects. - */ - function NetworkStatus() - { - // Private Member Variables - var networkIconSrc = new Array( - "<img src=\"statusbar.snippet/icons/signal/signal0.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/signal/signal0.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/signal/signal25.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/signal/signal50.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/signal/signal75.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/signal/signal100.png\" alt=\"\">"); - var enumNetworkStrengths = new Object(); - var currentState; // last known signal state - see enumNetworkStrengths - - enumNetworkStrengths.state = {Offline:0, NoSignal:1, Signal1:2, - Signal2:3, Signal3:4, Signal4:5} - - currentState = enumNetworkStrengths.state.Offline; - - //! Encodes the specified string for display in HTML format. - /*! - \param str string to encode - */ - // Note: this function doesn't handle partial or double encoding. - function htmlEncode(str) - { - var s; // function return - - // Encode special HTML characters (&, ", <, >, and '). - s = str.replace(/&/g, '&'); - s = s.replace(/\"/g, '"'); - s = s.replace(/</g, '<'); - s = s.replace(/>/g, '>'); - s = s.replace(/'/g, '''); - - return (s); - } - - //! Updates the field width for the network provider name. - /*! - \param s network provider name - */ - function updateFieldWidth(s) - { - if (document.getElementById) { - var rulerSpan = document.getElementById('sbruler'); - var fieldWidth; - - rulerSpan.innerHTML = s; - fieldWidth = rulerSpan.offsetWidth + 10; // add 10 pixel padding - document.getElementById('provider').width = fieldWidth + "px"; - } - } - - //! Converts the specified strength using a scale of -1 to 100 to the - //! appropriate signal level state. - /*! - \param strength signal strength to convert - */ - function convertStrengthToState(strength) - { - var state; - - if (strength < 0) // unknown network mode or error - state = enumNetworkStrengths.state.Offline; - else if (strength == 0) // no signal - state = enumNetworkStrengths.state.NoSignal; - else if (strength < 40) // less than 40/100 - state = enumNetworkStrengths.state.Signal1; - else if (strength < 65) // less than 65/100 - state = enumNetworkStrengths.state.Signal2; - else if (strength < 90) // less than 90/100 - state = enumNetworkStrengths.state.Signal3; - else // 90/100 or higher - full signal - state = enumNetworkStrengths.state.Signal4; - - return (state); - } - - //! Changes the displayed network provider name. - /*! - \param networkName New network provider name to display - */ - function changeName(networkName) - { - // truncate name if it's too long - if (networkName.length > NetworkStatus.MAX_NAME_LEN) - networkName = networkName.substring(0, NetworkStatus.MAX_NAME_LEN); - // set field width to the appropriate width and change the name - updateFieldWidth(htmlEncode(networkName)); - document.getElementById('provider').innerHTML = htmlEncode(networkName); - - // repaint if status bar exists (first call to this function, it doesn't) - if (window.snippets.StatusBarChromeId) - window.snippets.StatusBarChromeId.repaint(); - } - - //! Gets the appropriate image tag HTML string for the current network - //! signal strength. - this.getInitialStrengthImgTag = function() - { - var strength = window.deviceDelegate.networkSignalStrength; - - currentState = convertStrengthToState(strength); - return (networkIconSrc[currentState]); - } - - //! Displays the initial network name. - this.showInitialNetworkName = function() - { - // if we went offline, set the provider name to "offline" - if (currentState == enumNetworkStrengths.state.Offline) - changeName(window.localeDelegate.translateText("offline")); - else - changeName(window.deviceDelegate.networkName); - } - - //! Handles the signal strength change signal. - /*! - \param strength new signal strength - */ - this.handleSignalStrengthChange = function(strength) - { - var state = convertStrengthToState(strength); - - // only interested in state changes - if (currentState != state) { - lastState = currentState; // save former state - // update current state and network icon - currentState = state; - document.getElementById('strength').innerHTML = - networkIconSrc[currentState]; - window.snippets.StatusBarChromeId.repaint(); - - // if we went offline, change the provider name to "offline" - if (currentState == enumNetworkStrengths.state.Offline) - changeName(window.localeDelegate.translateText("offline")); - // if we just came online, get and update provider name - else if (lastState == enumNetworkStrengths.state.Offline) - changeName(window.deviceDelegate.networkName); - } - } - - //! Handles the network name change signal. - /*! - \param networkName new network name - */ - this.handleNameChange = function(networkName) - { - // Offline network name is hard coded. - if (currentState != enumNetworkStrengths.state.Offline) - changeName(networkName); - } - } - - // class property (i.e. property of the class constructor function) - NetworkStatus.MAX_NAME_LEN = 20; // max length of provider name - - /*! - Class to handle updating the battery level. Only 1 BatteryStatus object - should be created for the browser status bar. This class is not designed - to be code space efficient for creating multiple objects. - */ - function BatteryStatus() - { - // Private Member Variables - var batteryIconSrc = new Array( - "<img src=\"statusbar.snippet/icons/battery/batt10.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt20.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt30.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt40.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt50.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt60.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt70.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt80.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt90.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt100.png\" alt=\"\">", - "<img src=\"statusbar.snippet/icons/battery/batt100_charging.png\" alt=\"\">"); - var enumBatteryLevels = new Object(); - - enumBatteryLevels.state = {Level10:0, Level20:1, Level30:2, Level40:3, - Level50:4, Level60:5, Level70:6, Level80:7, Level90:8, Level100:9, - LevelCharging:10} - - //! Converts the specified battery level (1 to 100) to a battery state. - /*! - \param level battery level (1 to 100) - */ - function convertLevelToState(level) - { - var state; - - // Don't report battery level as being any higher than it actually is. - // Unless it is under 10% in which case user story specifies one bar be displayed. - if (window.deviceDelegate.batteryCharging) - state = enumBatteryLevels.state.LevelCharging; - else if (level < 20) // less than 20% full - state = enumBatteryLevels.state.Level10; - else if (level < 30) // less than 30% full - state = enumBatteryLevels.state.Level20; - else if (level < 40) // less than 40% full - state = enumBatteryLevels.state.Level30; - else if (level < 50) // less than 50% full - state = enumBatteryLevels.state.Level40; - else if (level < 60) // less than 60% full - state = enumBatteryLevels.state.Level50; - else if (level < 70) // less than 70% full - state = enumBatteryLevels.state.Level60; - else if (level < 80) // less than 80% full - state = enumBatteryLevels.state.Level70; - else if (level < 90) // less than 90% full - state = enumBatteryLevels.state.Level80; - else if (level < 100) // less than 100% full - state = enumBatteryLevels.state.Level90; - else // 100% full - state = enumBatteryLevels.state.Level100; - - return (state); - } - - //! Gets the initial battery level image tag HTML string. - this.getInitialLevelImgTag = function() - { - return (batteryIconSrc[convertLevelToState( - window.deviceDelegate.batteryLevel)]); - } - - //! Handles battery level change signal. - /*! - \param level new battery level - */ - this.handleLevelChange = function(level) - { - document.getElementById('battery').innerHTML = - batteryIconSrc[convertLevelToState(level)]; - window.snippets.StatusBarChromeId.repaint(); - } - } - - // Private Member Variables - var sbTitle = new Title(); //!< status bar title - var sbLockStatus = new LockStatus(); //!< status bar lock status - var sbClock = new Clock(); //!< status bar clock - var sbNetworkStatus = new NetworkStatus(); //!< status bar network status - var sbBatteryStatus = new BatteryStatus(); //!< status bar battery status - - // Private Methods - //! Write status bar HTML code to document. - function _statusbar_write() - { - var html = ''+ - '<table>'+ - '<tr>'+ - '<td class="leftalign" id="strength">' + sbNetworkStatus.getInitialStrengthImgTag() + '</td>'+ - '<td class="centeralign" id="provider"> </td>'+ - '<td class="leftalign"><div id="title">Bedrock Browser</div></td>'+ - '<td class="rightalign" id ="lock"> </td>'+ - '<td class="centeralign" id="clock">time: </td>' + - '<td class="rightalign" id="battery">' + sbBatteryStatus.getInitialLevelImgTag() + '</td>'+ - '</tr>'+ - '</table>'+ - // ruler span used for getting the width of network name - // style included here because style sheet not applied early - // enough for sbNetworkStatus.showInitialNetworkName call below - // which needs text width which depends on font - '<span id="sbruler" style="font-size:12px;font-weight:bold;visibility:hidden;"></span>'; - document.write(html); - - sbNetworkStatus.showInitialNetworkName(); - } - - // Public Methods - //! Update the time on the status bar clock. - this.showtime = function() - { - sbClock.showtime(); - } - - //! Handles current view change signal. - this.handleCurrentViewChange = function() - { - sbTitle.handleCurrentViewChange(); - sbLockStatus.handleCurrentViewChange(); - } - - // StatusBar Constructor - _statusbar_write(); // write status bar HTML code to document - this.showtime(); // display current time on status bar - // Update displayed time every 30 seconds. The statusbar object is created - // in chrome.html (it is this object). - setInterval("statusbar.showtime()", 30000); - - // Note that in the slots below the "this" object is never used directly. - // This is because they don't have access to "this" as they are called - // externaly. - - // Connect page controller signals to slots. - window.pageController.titleChanged.connect( - function(title) {sbTitle.handleTitleChange(title);}); - window.pageController.partialUrlChanged.connect( - function(partialUrl) {sbTitle.handlePartialUrlChange(partialUrl);}); - window.pageController.hideSecureIcon.connect( - function() {sbLockStatus.removeLockIcon();}); - window.pageController.showSecureIcon.connect( - function() {sbLockStatus.showLockIcon();}); - - // Connect view manager signals to slots. - window.viewManager.currentViewChanged.connect( - function() { - sbTitle.handleCurrentViewChange(); - sbLockStatus.handleCurrentViewChange(); - } - ); - - // Connect device delegate signals to slots. - window.deviceDelegate.batteryLevelChanged.connect( - function(level) {sbBatteryStatus.handleLevelChange(level);}); - window.deviceDelegate.networkSignalStrengthChanged.connect( - function(strength) {sbNetworkStatus.handleSignalStrengthChange(strength);}); - window.deviceDelegate.networkNameChanged.connect( - function(networkName) {sbNetworkStatus.handleNameChange(networkName);}); -} - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/suggests.snippet/suggests.css --- a/ginebra/chrome/bedrockchrome/suggests.snippet/suggests.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -.Suggests { - font-family: Verdana; - font-size:22px; - color:#222; - background-color:white -} - -.suggestsBox { - height:155px -} - -.suggestBoxBody { - background-color:white; -} -.suggestBoxBody div { - display:none; -} -.suggestBoxBody div.show { - display:block; -} - -.suggestBoxBody div ul { - margin:0 0px 0 0px; - padding:0; - list-style: none; - border-bottom: 1px solid; - border-left: 1px solid; - border-right: 1px solid; - text-align: left; -} -.suggestBoxBody div li { - border-bottom: none; - margin: 0px; - padding-left:5px; - text-align:left; -} -.suggestBoxBody div ul li.last { - border-bottom:none; -} - -.suggestBoxBody div ul span.searchTag -{ - color:blue; -} - -.suggestBoxBody div ul span.listTag -{ - color:black; -} - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/suggests.snippet/suggests.js --- a/ginebra/chrome/bedrockchrome/suggests.snippet/suggests.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -function Suggests() -{ - // attach internal funcs - this.write = writeSuggests; - - // do setup - this.write(); - - this.showSuggests = function() { - //window.chrome.alert("showSuggests"); - window.snippets.updateGeometry(); - window.snippets.SuggestsId.repaint(); - - window.snippets.SuggestsId.setPosition(5,68); - window.snippets.SuggestsId.show(); - window.snippets.SuggestsId.zValue = 10; - } - - this.hideSuggests = function() { - // window.snippets.ContextMenuBgId.hide(); - window.snippets.SuggestsId.hide(); - } - - this.setWidth = function(width) { - document.getElementById("SuggestsId").style.width = width; - //window.chrome.alert("set width:" + document.getElementById("SuggestsId").offsetWidth); - } - - this.setHeight = function(height) { - document.getElementById("SuggestsId").style.height = height; - //window.chrome.alert("set height:" + document.getElementById("SuggestsId").offsetHeight); - } - - this.removeAllItems = function() { - var parentList = document.getElementById("SuggestsUListId"); - while (parentList.childNodes[0]) { - parentList.removeChild(parentList.childNodes[0]); - } - this.setHeight(0); - } - - this.addItem = function(str) { - this.setHeight(document.getElementById("SuggestsId").offsetHeight + 26); // FIXME 26 is the row height - var parentList = document.getElementById("SuggestsUListId"); - var item = document.createElement("li"); - var searchTag = "<span id='sTag' class='searchTag'>S: <span/>"; - var historyTag = "<span id='hTag' class='searchTag'>H: <span/>"; - var bookmarkTag = "<span id='bTag' class='searchTag'>B: <span/>"; - item.innerHTML = searchTag + "<span class='listTag'>" + str + "<span/>"; - item.onmousedown=function() { - document.getElementById("urlBox").value = str; - var searchStr = window.chrome.searchUrl(str); - window.snippets.SuggestsId.hide(); - window.pageController.currentLoad(searchStr); - } - item.onmouseover=function() { item.style.backgroundColor = 'Aquamarine';} - item.onmouseout=function() { item.style.backgroundColor = ''; } - parentList.appendChild(item); - } -} - -// "Private" methods -function writeSuggests() { - var html = - '<div class="suggestsBox">' + - '<div class="suggestBoxBody">' + - '<div id="SuggestsListId" class="show">' + - '<ul id="SuggestsUListId">' + - '</ul>' + - '</div>' + - '</div>' + - '</div>'; - document.write(html); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,444 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient7480" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient2860" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(92.426516,1.208512)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1594" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#870d09" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="-0.66687342" - inkscape:cy="50" - inkscape:window-x="17" - inkscape:window-y="187" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><path - id="path2262" - d="m 40.050754,45.169631 0,-9.891384 9.891066,0 0,9.891384 9.891063,0 0,9.891381 -9.891063,0 0,9.891383 -9.891066,0 0,-9.891383 -9.891063,0 0,-9.891381 9.891063,0 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.29896068;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,444 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient7480" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient2860" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(92.426516,1.208512)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1594" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#870d09" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="-0.66687342" - inkscape:cy="50" - inkscape:window-x="17" - inkscape:window-y="187" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><path - id="path2262" - d="m 40.050754,45.169631 0,-9.891384 9.891066,0 0,9.891384 9.891063,0 0,9.891381 -9.891063,0 0,9.891383 -9.891066,0 0,-9.891383 -9.891063,0 0,-9.891381 9.891063,0 z" - style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:1.29896067999999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/addwindow_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,460 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient7480" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient2860" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(92.426516,1.208512)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3639" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3641" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3643" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1594" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#870d09" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="-0.66687342" - inkscape:cy="50" - inkscape:window-x="17" - inkscape:window-y="187" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><path - id="path2262" - d="m 40.050754,45.169631 0,-9.891384 9.891066,0 0,9.891384 9.891063,0 0,9.891381 -9.891063,0 0,9.891383 -9.891066,0 0,-9.891383 -9.891063,0 0,-9.891381 9.891063,0 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.29896067999999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3639)" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop34" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - - - </defs><sodipodi:namedview - pagecolor="#7e7874" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.47058824" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="4.72" - inkscape:cx="57.930986" - inkscape:cy="58.227019" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> - - -<path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3924" /><path - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.36459303;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - clip-path="none" - d="m 47.71875,20.4375 -24.65625,25.875 24.65625,26.84375 0,-16.125 27.21875,0.21875 0,-20.9375 -27.21875,0.21875 0,-16.09375 z" - id="path3826" - sodipodi:nodetypes="cccccccc" /><path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3916" - clip-path="none" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back_pushed.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop34" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - - - </defs><sodipodi:namedview - pagecolor="#7e7874" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.47058824" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="4.72" - inkscape:cx="57.930986" - inkscape:cy="58.227019" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> - - -<path - style="fill:#808080;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3924" /><path - style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:2.36459302999999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - clip-path="none" - d="m 47.71875,20.4375 -24.65625,25.875 24.65625,26.84375 0,-16.125 27.21875,0.21875 0,-20.9375 -27.21875,0.21875 0,-16.09375 z" - id="path3826" - sodipodi:nodetypes="cccccccc" /><path - style="fill:#808080;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3916" - clip-path="none" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/back_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,216 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop34" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - - - <filter - id="filter2992" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2994" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2996" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2998" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3000" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3002" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3004" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3006" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3008" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#7e7874" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.47058824" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="4.72" - inkscape:cx="57.930986" - inkscape:cy="58.227019" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> - - -<path - style="fill:#ffffff;fill-opacity:0;stroke:none;filter:url(#filter2992)" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3924" /><path - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.36459302999999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2998)" - clip-path="none" - d="m 47.71875,20.4375 -24.65625,25.875 24.65625,26.84375 0,-16.125 27.21875,0.21875 0,-20.9375 -27.21875,0.21875 0,-16.09375 z" - id="path3826" - sodipodi:nodetypes="cccccccc" /><path - style="fill:#ffffff;fill-opacity:0;stroke:none;filter:url(#filter3004)" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3916" - clip-path="none" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/btnBorder.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/btnBorder.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/btnBorder.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/btnBorder.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="1" - height="100" - viewBox="0 0 1 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="btnBorder.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" /> - <stop - id="stop34" - style="stop-color:#000000;stop-opacity:1;" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - - - </defs><sodipodi:namedview - pagecolor="#7e7874" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.47058824" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="6.675088" - inkscape:cx="-2.6986122" - inkscape:cy="26.618097" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> - - -<path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3924" /><path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3916" - clip-path="none" /><rect - style="fill:#838383;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none" - id="rect2828" - width="1" - height="100" - x="-3.8146973e-06" - y="0" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,457 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="delwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2792" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2790" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4368" - x1="-21.2987" - y1="-3.6796536" - x2="18.7013" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4376" - x1="-21.478487" - y1="-3.6796536" - x2="18.881084" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4420" - x1="35.333408" - y1="50.115414" - x2="54.65918" - y2="50.115414" - gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1400" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="-26.099774" - inkscape:cy="58.252689" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><circle - transform="matrix(0.99819439,-0.06002187,0.06002013,0.99822334,-4.4439508,-0.80629186)" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient4052);stroke:#787878" - id="circle50074" - r="31.795" - cy="53.796001" - cx="46.294998" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><rect - style="opacity:1;fill:url(#linearGradient4420);fill-opacity:1.0;fill-rule:nonzero;stroke:#20548b;stroke-width:0.64592773999999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4378" - width="18.679844" - height="5.7616491" - x="35.656372" - y="47.234589" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/delwindow_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,449 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="delwindow_disabled.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\delwindow_disabled.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2792" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2790" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4368" - x1="-21.2987" - y1="-3.6796536" - x2="18.7013" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4376" - x1="-21.478487" - y1="-3.6796536" - x2="18.881084" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1400" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="5.7184079" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><circle - transform="matrix(0.99819439,-0.06002187,0.06002013,0.99822334,-4.4439508,-0.80629186)" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient4052);stroke:#787878" - id="circle50074" - r="31.795" - cy="53.796001" - cx="46.294998" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><rect - style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#20548b;stroke-width:0.64592773999999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4378" - width="18.679844" - height="5.7616491" - x="35.656372" - y="47.234589" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100" - height="100" - viewBox="0 0 99.999998 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere.svg"><metadata - id="metadata75"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs73"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 150.125 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="312.28101 : 150.125 : 1" - inkscape:persp3d-origin="156.1405 : 100.08333 : 1" - id="perspective77" /></defs><sodipodi:namedview - pagecolor="#710000" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview71" - showgrid="false" - inkscape:zoom="3.1440466" - inkscape:cx="6.1305334" - inkscape:cy="67.030966" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<path - style="fill:#848484" - d="M 76.597602,51.708266 C 76.441488,48.132361 75.92573,44.523279 74.60195,41.194536 73.351375,38.050656 71.448061,35.054433 69.162088,32.622624 66.81927,30.129953 64.21691,28.068164 61.147871,26.64605 58.055541,25.21211 54.758293,24.27278 51.36954,24.0709 c -6.377101,-0.381267 -12.877872,1.838568 -17.885163,5.943118 -4.766049,3.907575 -8.180591,9.535469 -9.520452,15.690277 -1.456879,6.693253 -0.374895,14.133755 3.065156,20.014869 0.864034,1.476917 1.757737,2.938828 2.895455,4.206647 1.12219,1.25023 2.318139,2.46354 3.610308,3.523137 2.577128,2.113119 5.519999,3.711456 8.658914,4.708173 6.224592,1.97671 13.030103,1.499697 18.938862,-1.339919 5.458719,-2.624757 10.221718,-7.367251 12.795794,-13.042732 0.81939,-1.806846 1.398371,-3.73136 1.869208,-5.664234 0.517144,-2.120338 0.704869,-4.221361 0.79998,-6.40197" - id="path3" /> -<path - style="fill:#848484" - d="m 76.531052,51.639043 c 0,6.700471 -2.380529,13.304321 -6.641079,18.336955 -2.149547,2.539677 -4.88889,4.878331 -7.822056,6.35265 -3.062105,1.540066 -6.308887,2.563609 -9.697085,2.910849 -6.617789,0.679188 -13.470162,-1.435379 -18.709822,-5.693079 -4.750521,-3.861712 -8.370256,-9.622559 -9.626654,-15.772462 -0.694887,-3.401137 -0.930583,-7.185273 -0.324429,-10.61957 0.595896,-3.377204 1.703389,-6.822462 3.45669,-9.740529 1.726681,-2.873357 3.859868,-5.55291 6.487184,-7.580664 1.321006,-1.019219 2.710226,-1.963453 4.145476,-2.799533 1.474347,-0.859146 3.091776,-1.395867 4.706432,-1.894802 6.40372,-1.978443 13.620452,-1.354051 19.542798,1.897687 1.431368,0.786475 2.86218,1.65082 4.146862,2.680705 1.28995,1.033637 2.487009,2.30059 3.579805,3.553125 2.191695,2.511699 3.83214,5.346411 4.97679,8.515384 0.976613,2.70695 1.739159,5.723649 1.778257,8.635365 0.005,0.373477 0.0055,0.747544 -0.0011,1.121307 -0.0039,0.203899 -1.457987,0.09748 -1.696179,0.09748 -1.654586,0 -3.309172,0 -4.96348,0 -6.635811,0 -13.27079,0 -19.907157,0 8.8569,-8.66e-4 17.711858,-8.66e-4 26.568756,-8.66e-4" - id="path5" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 23.362099,51.639043 c 0,6.700471 2.380529,13.304321 6.64108,18.336955 2.149546,2.539677 4.888889,4.878331 7.822056,6.35265 3.062105,1.540066 6.308886,2.563609 9.697085,2.910849 6.617788,0.679188 13.470162,-1.435379 18.709821,-5.693079 4.750521,-3.861712 8.370257,-9.622559 9.626654,-15.772462 0.694888,-3.401137 0.930583,-7.185273 0.324429,-10.61957 -0.595896,-3.377204 -1.703389,-6.822462 -3.45669,-9.740529 -1.72668,-2.873357 -3.859867,-5.55291 -6.487184,-7.580664 -1.321006,-1.019219 -2.710226,-1.963453 -4.145475,-2.799533 -1.474347,-0.859146 -3.091776,-1.395867 -4.706433,-1.894802 -6.40372,-1.978443 -13.620452,-1.354051 -19.542797,1.897687 -1.431368,0.786475 -2.862181,1.65082 -4.146863,2.680705 -1.289949,1.033637 -2.487008,2.30059 -3.579805,3.553125 -2.191695,2.511699 -3.832139,5.346411 -4.976789,8.515384 -1.14576,3.170706 -1.779089,6.458785 -1.779089,9.853284" - id="path7" /> -<path - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 69.937112,51.708266 c -0.177189,-3.51189 -0.851279,-6.847841 -2.5042,-9.944134 -1.523982,-2.854901 -3.660219,-5.339202 -6.255925,-7.181521 -5.409084,-3.839219 -12.592541,-4.775377 -18.668228,-2.123803 -2.989179,1.304445 -5.867166,3.353844 -7.918274,5.98379 -2.028649,2.601683 -3.453916,5.764018 -4.129671,9.029023 -0.720675,3.479873 -0.514371,6.962337 0.483038,10.361749 0.483593,1.649373 1.113871,3.248568 2.008407,4.704135 0.42148,0.686683 0.858211,1.370489 1.353726,2.001518 0.50134,0.638524 0.999351,1.37424 1.598851,1.914419 1.247524,1.125059 2.499486,2.235985 3.924753,3.114463 1.432754,0.8828 2.971433,1.582177 4.569452,2.070731 3.246225,0.991535 6.828804,1.115259 10.114406,0.247743 1.675105,-0.442128 3.244561,-0.978555 4.763275,-1.850109 1.413622,-0.811273 2.653105,-1.686293 3.862641,-2.801544 2.420459,-2.231662 4.339579,-5.072725 5.477019,-8.227852 0.839078,-2.330007 1.19484,-4.824402 1.32073,-7.298608" - id="path9" /> -<path - style="fill:#ffffff;fill-opacity:0.01739131" - d="m 69.870286,51.708266 c -0.213791,3.44641 -0.791385,6.774009 -2.36833,9.849541 -1.452442,2.834998 -3.702922,5.308337 -6.208231,7.176322 -1.308528,0.975089 -2.77622,1.686293 -4.261105,2.319627 -1.542284,0.657274 -3.046023,0.94452 -4.688963,1.180141 -1.655694,0.237648 -3.347991,0.239381 -5.005349,0.01152 -1.605229,-0.220623 -3.318877,-0.602184 -4.807366,-1.276467 -2.944536,-1.333291 -5.583498,-3.213389 -7.653186,-5.77296 -2.079116,-2.570827 -3.64996,-5.640302 -4.333756,-8.938762 -1.35844,-6.552806 0.345503,-13.68674 4.746639,-18.634875 4.205648,-4.728648 10.530063,-7.305531 16.70613,-6.550206 1.625192,0.198709 3.195759,0.453661 4.713364,1.109774 1.449946,0.626705 2.886027,1.308197 4.215629,2.182065 2.676675,1.758678 4.764387,4.349114 6.380428,7.150943 1.802104,3.121672 2.342818,6.615678 2.564096,10.193315 -6.635535,0 -13.270792,0 -19.906326,0 6.635534,0 13.271068,0 19.906326,0" - id="path11" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 69.870286,51.708266 c -0.213791,3.44641 -0.791385,6.774009 -2.36833,9.849541 -1.452442,2.834998 -3.702922,5.308337 -6.208231,7.176322 -1.308528,0.975089 -2.77622,1.686293 -4.261105,2.319627 -1.542284,0.657274 -3.046023,0.94452 -4.688963,1.180141 -1.655694,0.237648 -3.347991,0.239381 -5.005349,0.01152 -1.605229,-0.220623 -3.318877,-0.602184 -4.807366,-1.276467 -2.944536,-1.333291 -5.583498,-3.213389 -7.653186,-5.77296 -2.079116,-2.570827 -3.64996,-5.640302 -4.333756,-8.938762 -1.35844,-6.552806 0.345503,-13.68674 4.746639,-18.634875 4.205648,-4.728648 10.530063,-7.305531 16.70613,-6.550206 1.625192,0.198709 3.195759,0.453661 4.713364,1.109774 1.449946,0.626705 2.886027,1.308197 4.215629,2.182065 2.676675,1.758678 4.764387,4.349114 6.380428,7.150943 1.802104,3.121672 2.342818,6.615678 2.564096,10.193315" - id="path13" /> -<path - style="fill:#010101" - d="m 50.023577,51.154527 c -0.02163,-14.822466 -0.04464,-29.644931 -0.06655,-44.4676916 1.306033,7.4725186 2.613175,14.9450376 3.91893,22.4178506 0.652185,3.727893 1.303539,7.456082 1.955723,11.184556 0.155836,0.891448 0.31195,1.78261 0.467509,2.674648 0.07847,0.445291 0.155837,0.891448 0.234032,1.336748 0.09539,0.543636 0.0055,0.562091 -0.343284,0.925483 -1.255289,1.305884 -2.511409,2.612063 -3.767252,3.917955 -0.821609,0.854537 -1.643217,1.709653 -2.465103,2.56419 0.02191,-0.184872 0.04381,-0.368868 0.06599,-0.553739" - id="path15" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 50.023577,51.154527 c -0.02163,-14.822466 -0.04464,-29.644931 -0.06655,-44.4676916 1.306033,7.4725186 2.613175,14.9450376 3.91893,22.4178506 0.652185,3.727893 1.303539,7.456082 1.955723,11.184556 0.155836,0.891448 0.31195,1.78261 0.467509,2.674648 0.07847,0.445291 0.155837,0.891448 0.234032,1.336748 0.09539,0.543636 0.0055,0.562091 -0.343284,0.925483 -1.255289,1.305884 -2.511409,2.612063 -3.767252,3.917955 -0.821609,0.854537 -1.643217,1.709653 -2.465103,2.56419" - id="path17" /> -<path - style="fill:#010101" - d="m 50.023577,51.154527 c 14.430137,0.184871 28.859721,0.369448 43.289581,0.553739 -7.198154,1.345109 -14.396308,2.690218 -21.595017,4.035336 -3.591175,0.670818 -7.181794,1.342224 -10.773801,2.013051 -0.859042,0.16035 -1.717252,0.320414 -2.576295,0.481059 -0.429244,0.07989 -0.858765,0.160922 -1.288009,0.241097 -0.524354,0.09806 -0.544873,0.0026 -0.897308,-0.359926 -1.266103,-1.303865 -2.533038,-2.608605 -3.799141,-3.911898 -0.542101,-0.558349 -1.083647,-1.116698 -1.625747,-1.675333 -0.23431,-0.239944 -0.521582,-0.472117 -0.710693,-0.752439 -0.123671,-0.182558 -0.04797,-0.422797 -0.02358,-0.624686" - id="path19" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 50.023577,51.154527 c 14.430137,0.184871 28.859721,0.369448 43.289581,0.553739 -7.198154,1.345109 -14.396308,2.690218 -21.595017,4.035336 -3.591175,0.670818 -7.181794,1.342224 -10.773801,2.013051 -0.859042,0.16035 -1.717252,0.320414 -2.576295,0.481059 -0.429244,0.07989 -0.858765,0.160922 -1.288009,0.241097 -0.524354,0.09806 -0.544873,0.0026 -0.897308,-0.359926 -1.266103,-1.303865 -2.533038,-2.608605 -3.799141,-3.911898 -0.808853,-0.833767 -1.617984,-1.664952 -2.426559,-2.498719" - id="path21" /> -<path - style="fill:#010101" - d="m 50.023577,51.154527 c -14.42986,0.184871 -28.860275,0.370028 -43.2901348,0.553739 7.1881718,-1.361841 14.3763438,-2.723682 21.5645148,-4.084943 3.581192,-0.678901 7.162661,-1.356936 10.743853,-2.035543 0.845733,-0.160065 1.691465,-0.320423 2.53692,-0.480773 0.422866,-0.07963 0.845733,-0.160065 1.268599,-0.239954 0.457804,-0.08709 0.46446,-0.07148 0.76615,0.243991 1.263331,1.313968 2.526661,2.627642 3.789991,3.94161 0.851002,0.885106 1.702556,1.770792 2.553558,2.655612 0.02247,-0.184872 0.04436,-0.368868 0.06654,-0.553739" - id="path23" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 50.023577,51.154527 c -14.42986,0.184871 -28.860275,0.370028 -43.2901348,0.553739 7.1881718,-1.361841 14.3763438,-2.723682 21.5645148,-4.084943 3.581192,-0.678901 7.162661,-1.356936 10.743853,-2.035543 0.845733,-0.160065 1.691465,-0.320423 2.53692,-0.480773 0.422866,-0.07963 0.845733,-0.160065 1.268599,-0.239954 0.457804,-0.08709 0.46446,-0.07148 0.76615,0.243991 1.263331,1.313968 2.526661,2.627642 3.789991,3.94161 0.851002,0.885106 1.702556,1.770792 2.553558,2.655612" - id="path25" /> -<path - style="fill:#010101" - d="m 50.023577,51.154527 c -1.238374,1.364146 -2.476748,2.728872 -3.715122,4.093304 -0.594509,0.654969 -1.189016,1.309064 -1.783249,1.964605 -0.285607,0.314644 -0.571769,0.629582 -0.857378,0.944234 -0.373786,0.411836 -0.369627,0.414722 -0.262038,0.973356 0.71291,3.714923 1.426099,7.429836 2.13901,11.145045 1.428039,7.440797 2.855803,14.881299 4.28412,22.321229 0.0427,0.223803 0.08569,0.447605 0.128385,0.670255 0,-7.017428 0,-14.034848 0,-21.052267 0,-3.560334 0,-7.120374 0,-10.681003 0,-1.71311 0,-3.427668 0,-5.140492 -2.77e-4,-1.725805 -0.139754,-3.523709 0.06627,-5.238266" - id="path27" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 50.023577,51.154527 c -1.238374,1.364146 -2.476748,2.728872 -3.715122,4.093304 -0.594509,0.654969 -1.189016,1.309064 -1.783249,1.964605 -0.285607,0.314644 -0.571769,0.629582 -0.857378,0.944234 -0.373786,0.411836 -0.369627,0.414722 -0.262038,0.973356 0.71291,3.714923 1.426099,7.429836 2.13901,11.145045 1.428039,7.440797 2.855803,14.881299 4.28412,22.321229 0.0427,0.223803 0.08569,0.447605 0.128385,0.670255 0,-13.852862 0,-27.705437 0,-41.55887" - id="path29" /> -<path - style="fill:#ffffff" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -1.680928,0.856269 -3.361578,1.712825 -5.042507,2.569094 -0.362971,0.184871 -0.725388,0.369448 -1.088083,0.554311 -0.356316,0.181405 -0.530177,0.193519 -0.530177,0.608821 0,1.064206 0,2.128699 0,3.1932 -0.02218,-0.115944 -0.04436,-0.230726 -0.06654,-0.346374" - id="path31" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -1.680928,0.856269 -3.361578,1.712825 -5.042507,2.569094 -0.362971,0.184871 -0.725388,0.369448 -1.088083,0.554311 -0.356316,0.181405 -0.530177,0.193519 -0.530177,0.608821 0,1.064206 0,2.128699 0,3.1932" - id="path33" /> -<path - style="fill:#010101" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -0.930583,1.934903 -1.861166,3.870082 -2.791472,5.804404 -0.130602,0.271381 -0.311395,0.938169 -0.558182,1.101119 -0.208246,0.137856 -0.745077,0.01958 -0.973009,0.01958 -0.502172,0 -1.004065,0 -1.50679,0 -0.24041,0 -0.48082,0 -0.722062,0 -0.18717,0 -0.150569,-0.215441 -0.175801,-0.346088" - id="path35" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -0.840187,1.747432 -1.680928,3.495158 -2.521114,5.24259 -0.181348,0.377229 -0.363249,0.754753 -0.544597,1.131982 -0.17996,0.374058 -0.19327,0.550854 -0.597557,0.550854 -0.999075,0 -1.998148,0 -2.997499,0" - id="path37" /> -<path - style="fill:#ffffff" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 0.828263,1.722339 1.656248,3.444105 2.484512,5.166738 0.184952,0.385019 0.370182,0.770324 0.555411,1.155343 0.159718,0.332241 0.184952,0.603336 0.562898,0.603336 0.996854,0 1.993986,0 2.990842,0" - id="path39" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 1.109989,2.30838 2.219978,4.616751 3.329967,6.925417" - id="path41" /> -<path - style="fill:#010101" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 1.680651,0.856269 3.361578,1.712825 5.042229,2.569094 0.362695,0.184863 0.725667,0.369448 1.088361,0.554311 0.356871,0.181986 0.531009,0.192072 0.523245,0.608821 -0.02024,1.064492 -0.04021,2.128985 -0.06017,3.193191" - id="path43" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 2.219978,1.131402 4.439956,2.261946 6.660212,3.393347" - id="path45" /> -<path - style="fill:#ffffff" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.179866,-0.601031 2.360009,-1.202634 3.54043,-1.803674 0.589795,-0.301092 1.179865,-0.601318 1.769938,-0.902124 0.321101,-0.163521 1.386446,-0.478745 1.367037,-0.916827 -0.01719,-0.39079 0.181901,-3.269337 -0.08375,-3.304239" - id="path47" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.680651,-0.855975 3.361578,-1.712539 5.042229,-2.568513 0.362695,-0.185158 0.725667,-0.369448 1.088361,-0.554606 0.355762,-0.181405 0.529622,-0.193805 0.529622,-0.608526 0,-1.064778 0,-2.129851 0,-3.194352" - id="path49" /> -<path - style="fill:#010101" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 0.827986,-1.722338 1.656248,-3.444391 2.484512,-5.167605 0.184952,-0.385304 0.370182,-0.770323 0.555411,-1.155342 0.159718,-0.332233 0.184952,-0.603917 0.562898,-0.603917 0.996854,0 1.993986,0 2.990842,0" - id="path51" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.109989,-2.308952 2.219978,-4.617331 3.329967,-6.926864" - id="path53" /> -<path - style="fill:#ffffff" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 C 62.437266,63.743892 61.596525,61.99646 60.756339,60.248162 60.574991,59.870647 60.39309,59.493704 60.211742,59.115894 60.034,58.747312 60.020968,58.56504 59.620285,58.56504 c -1.022921,0 -2.045841,0 -3.070148,0" - id="path55" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 -1.110543,-2.308952 -2.22081,-4.617331 -3.330522,-6.926864" - id="path57" /> -<path - style="fill:#010101" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 C 61.596525,64.635929 59.915875,63.779365 58.234946,62.923391 57.871975,62.738233 57.509558,62.553943 57.146863,62.368785 56.791656,62.18796 56.61835,62.173828 56.609754,61.760259 56.590345,60.6949 56.570372,59.630408 56.55014,58.56504" - id="path59" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653;stroke-linecap:square;stroke-miterlimit:10" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 -2.22081,-1.131401 -4.440234,-2.261945 -6.660767,-3.393347" - id="path61" /> -<path - style="fill:#ffffff" - d="m 49.957028,51.500615 c 0,13.92178 0,27.844436 0,41.766226 1.418889,-7.394943 2.838887,-14.790172 4.2575,-22.185107 0.710416,-3.699638 1.421109,-7.399267 2.13097,-11.099476 0.08152,-0.426549 0.1636,-0.854537 0.245678,-1.281086 0.05324,-0.277445 -0.402347,-0.590651 -0.576208,-0.774941 -0.644975,-0.684378 -1.290504,-1.369336 -1.935757,-2.053714 -1.271926,-1.349147 -2.543575,-2.698589 -3.816333,-4.048317 -0.102319,-0.107573 -0.204085,-0.216012 -0.30585,-0.323585" - id="path63" /> -<path - style="fill:#ffffff" - d="m 49.957028,51.500615 c 14.452598,0.06897 28.904641,0.137856 43.35613,0.207651 -7.181794,-1.356365 -14.36442,-2.711274 -21.546769,-4.066773 -3.587569,-0.677454 -7.176525,-1.354632 -10.764372,-2.032086 -0.827431,-0.156312 -1.654863,-0.312625 -2.481462,-0.468365 -0.413716,-0.07816 -0.826876,-0.156313 -1.241702,-0.234183 -0.443386,-0.08396 -0.600887,-0.184863 -0.91866,0.133819 -1.26444,1.276467 -2.529155,2.55179 -3.793872,3.827685 -0.869857,0.877611 -1.738881,1.755508 -2.609293,2.632252" - id="path65" /> -<path - style="fill:#ffffff" - d="m 50.090126,51.500615 c -14.45232,0.06897 -28.904364,0.137856 -43.3566838,0.207651 7.1881718,1.348566 14.3763438,2.69657 21.5645148,4.043698 3.581192,0.671398 7.162661,1.343376 10.743853,2.014783 0.845733,0.158912 1.691465,0.317243 2.53692,0.476155 0.422866,0.07902 0.845733,0.158617 1.268599,0.237354 0.453923,0.08509 0.459746,0.07408 0.758664,-0.236782 1.254734,-1.305884 2.510578,-2.611196 3.766144,-3.916508 0.906182,-0.94193 1.812363,-1.883564 2.717989,-2.826351" - id="path67" /> -<path - style="fill:#ffffff" - d="m 49.957028,51.500615 c 0,-14.938114 0,-29.875951 0,-44.8137796 -1.306033,7.4725186 -2.612897,14.9450376 -3.919208,22.4178506 -0.65163,3.727893 -1.303814,7.456082 -1.955445,11.184556 -0.155835,0.891448 -0.311673,1.78261 -0.467509,2.674648 -0.07791,0.445291 -0.155836,0.891448 -0.234032,1.336748 -0.09566,0.548254 -0.0014,0.564405 0.355762,0.924902 1.277195,1.28859 2.554944,2.576884 3.832139,3.866331 0.796374,0.802912 1.591918,1.606118 2.388293,2.408744" - id="path69" /> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,479 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere_disabled.svg"><metadata - id="metadata104"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs102"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective106" /><radialGradient - inkscape:collect="always" - xlink:href="#path1720_1_" - id="radialGradient2920" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - cx="-2299.998" - cy="-18798.3164" - r="19.7027" /><radialGradient - inkscape:collect="always" - xlink:href="#path1091_1_" - id="radialGradient2922" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - cx="-1951.1113" - cy="-18398.6855" - fx="-1950.5051" - fy="-18398.6855" - r="26.0669" /><linearGradient - inkscape:collect="always" - xlink:href="#path1727_1_" - id="linearGradient2924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)" - x1="-1934.1221" - y1="-18440.3535" - x2="-1929.3682" - y2="-18390.5215" /><linearGradient - inkscape:collect="always" - xlink:href="#path2345_1_" - id="linearGradient2926" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)" - x1="-12217.0928" - y1="-10465.0684" - x2="-12215.1611" - y2="-10465.0684" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview100" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="209" - inkscape:window-y="370" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.3986014,0,0,1.3986014,-19.58042,-20.27972)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="compass" - viewBox="-19.32 -19.32 38.639 38.639"> - - <radialGradient - id="path1720_1_" - cx="-2299.998" - cy="-18798.316" - r="19.7027" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#939598" - id="stop11" /> - <stop - offset="1" - style="stop-color:#A3A5A8" - id="stop13" /> - <a:midPointStop - offset="0" - style="stop-color:#939598" /> - <a:midPointStop - offset="0.5" - style="stop-color:#939598" /> - <a:midPointStop - offset="1" - style="stop-color:#A3A5A8" /> - </radialGradient> - <path - id="path1720_2_" - d="m 14.409,0.004 c 0.004,-7.955 -6.482,-14.408 -14.487,-14.411 -8.005,-0.004 -14.498,6.442 -14.501,14.399 0,0.004 0,0.008 0,0.012 -0.004,7.956 6.482,14.409 14.488,14.413 8.006,0.004 14.497,-6.443 14.5,-14.399 0,-0.004 0,-0.009 0,-0.014 z" - style="fill:url(#radialGradient2920);stroke:#010101" /> - - <radialGradient - id="path1091_1_" - cx="-1951.1113" - cy="-18398.686" - r="26.0669" - fx="-1950.5051" - fy="-18398.686" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop17" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop19" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </radialGradient> - <path - id="path1091_2_" - d="m 0,18.929 c -10.449,0 -18.928,-8.48 -18.928,-18.93 0,-10.448 8.479,-18.928 18.928,-18.928 10.449,0 18.929,8.479 18.929,18.928 0,10.449 -8.481,18.93 -18.929,18.93 z m 0,-4.563 c 7.93,0 14.367,-6.437 14.367,-14.367 0,-7.93 -6.437,-14.364 -14.367,-14.364 -7.93,0 -14.366,6.433 -14.366,14.364 0,7.931 6.435,14.367 14.366,14.367 z" - style="fill:url(#radialGradient2922);stroke:#010101;stroke-width:0.78200001;stroke-opacity:0.46520003" /> - - <linearGradient - id="path1727_1_" - gradientUnits="userSpaceOnUse" - x1="-1934.1221" - y1="-18440.354" - x2="-1929.3682" - y2="-18390.521" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop23" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop25" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path1727_2_" - d="m 0.001,17.614 c -9.798,0 -17.751,-7.92 -17.751,-17.678 0,-9.759 7.953,-17.677 17.751,-17.677 9.799,0 17.75,7.918 17.75,17.677 0,9.758 -7.951,17.678 -17.75,17.678 z m 0.071,-0.206 c 8.724,0 15.802,-7.813 15.802,-17.438 0,-9.624 -7.078,-17.436 -15.802,-17.436 -8.724,0 -15.802,7.812 -15.802,17.436 0,9.626 7.079,17.438 15.802,17.438 z" - style="fill:url(#linearGradient2924)" /> - <g - id="g3211_2_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1058_2_" - d="m -85.396,-5.522 1.845,-1.818 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9593,-0.8517,-0.9223,0.8858,-85.4303,-4.0513)" - font-size="1.0011" - id="text30" - style="font-size:1.00109994px;fill:#ffffff;font-family:Arial-BoldMT">SE</text> - - </g> - <g - id="g1104_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1044_2_" - d="m 132.683,33.045 c 0,-1.12 -0.906,-2.029 -2.025,-2.031 -1.121,0 -2.029,0.905 -2.03,2.026 0,10e-4 0,0.002 0,0.005 -10e-4,1.119 0.905,2.027 2.025,2.029 1.12,0 2.029,-0.907 2.03,-2.026 0,-0.002 0,-0.003 0,-0.003 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.8871,32.3284)" - font-size="1.5393" - id="text34" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">S</text> - - </g> - <g - id="g3206_2_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1059_2_" - d="m -109.454,-7.362 1.775,1.887 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9415,0.866,0.9378,0.8694,-105.9596,-5.5599)" - font-size="1.0026" - id="text38" - style="font-size:1.00259995px;fill:#ffffff;font-family:Arial-BoldMT">SW</text> - - </g> - <path - id="path1118_2_" - d="m 0.044,10.149 -1.419,-6.792 -3.633,1.635 1.638,-3.643 -6.794,-1.368 6.792,-1.417 -1.635,-3.634 3.645,1.638 1.365,-6.794 1.418,6.789 3.634,-1.633 -1.64,3.644 6.797,1.365 L 3.42,1.359 5.053,4.992 1.41,3.353 0.044,10.149 z M -0.003,2.751 c 1.505,0 2.728,-1.222 2.728,-2.729 0,-1.506 -1.223,-2.729 -2.728,-2.729 -1.506,0 -2.73,1.223 -2.73,2.729 0,1.507 1.224,2.729 2.73,2.729 z" - style="fill:#74ccdd;fill-opacity:0.08699999;stroke:#ffffff;stroke-width:1.95500004;stroke-opacity:0.46089998" /> - <g - id="g1109_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1043_2_" - d="m 148.643,49.095 c 0.001,-1.119 -0.905,-2.028 -2.026,-2.029 -1.119,-0.001 -2.028,0.905 -2.029,2.027 0,0 0,10e-4 0,0.002 -0.001,1.12 0.905,2.028 2.027,2.031 1.119,0 2.028,-0.908 2.028,-2.027 0,0 0,-0.003 0,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,145.8658,48.3771)" - font-size="1.5393" - id="text43" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">E</text> - - </g> - <g - id="g1099_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1042_2_" - d="m 116.45,49.171 c 10e-4,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.026 0,10e-4 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.026,2.029 1.12,10e-4 2.029,-0.905 2.03,-2.026 -10e-4,-10e-4 -10e-4,-0.002 -10e-4,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,113.0991,48.3646)" - font-size="1.7317" - id="text47" - style="font-size:1.73169994px;fill:#ffffff;font-family:Arial-BoldMT">W</text> - - </g> - <g - id="g1886_2_" - transform="matrix(0.781983,0,0,0.781983,433.1542,-41.87943)"> - <path - id="path1057_2_" - d="m -566.783,66.608 1.845,-1.817 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.8541,0.9296,1.0066,-0.7887,-564.9388,63.1555)" - font-size="1.0092" - id="text51" - style="font-size:1.00919998px;fill:#ffffff;font-family:Arial-BoldMT">NW</text> - - </g> - <g - id="g1891_2_" - transform="matrix(0.781983,0,0,0.781983,431.609,-41.97033)"> - <path - id="path1060_2_" - d="m -540.838,64.805 1.822,1.841 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.9427,-0.8651,-0.9368,-0.8705,-542.3832,64.5555)" - font-size="1.0024" - id="text55" - style="font-size:1.00240004px;fill:#ffffff;font-family:Arial-BoldMT">NE</text> - - </g> - <g - id="g1094_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1802_2_" - d="m 132.683,65.237 c 0,-1.119 -0.906,-2.029 -2.025,-2.029 -1.121,-10e-4 -2.029,0.905 -2.03,2.026 0,0.001 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.025,2.029 1.12,0.001 2.029,-0.907 2.03,-2.026 0,-0.001 0,-0.002 0,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72170003" /> - <text - transform="matrix(1.3848,0,0,-1.2788,129.761,64.5194)" - font-size="1.5393" - id="text59" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">N</text> - - </g> - <g - id="g2458_2_" - transform="matrix(0.687849,0.371969,-0.371969,0.687849,616.8255,126.7079)"> - <g - id="g2337_2_" - transform="translate(0,-4.882812e-6)"> - <path - id="path2335_2_" - d="m -757.814,241.357 -13.129,-8.59 0.646,-0.987 12.483,9.577" - style="fill:#828282;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - <path - id="path2336_2_" - d="m -757.814,241.357 -13.129,-8.59 -0.646,0.987 13.775,7.603" - style="fill:#8c8c8c;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - </g> - <path - id="path2341_2_" - d="m -784.071,224.179 13.128,8.589 0.646,-0.987 -13.774,-7.602" - style="fill:#afafaf;stroke:#010101;stroke-width:0.49450001;stroke-opacity:0.45489999" /> - <path - id="path2342_2_" - d="m -784.071,224.179 13.128,8.589 -0.646,0.987 -12.482,-9.576" - style="fill:#706f70;stroke:#010101;stroke-width:0.1978;stroke-opacity:0.45489999" /> - - <linearGradient - id="path2345_1_" - gradientUnits="userSpaceOnUse" - x1="-12217.093" - y1="-10465.068" - x2="-12215.161" - y2="-10465.068" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)"> - <stop - offset="0" - style="stop-color:#010101" - id="stop68" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop70" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path2345_2_" - d="m -770.389,231.762 c -0.521,-0.34 -1.22,-0.195 -1.561,0.327 -0.341,0.521 -0.196,1.22 0.326,1.562 0.522,0.341 1.221,0.195 1.562,-0.326 0.34,-0.522 0.194,-1.221 -0.327,-1.563 z" - style="fill:url(#linearGradient2926);stroke:#010101" /> - <path - id="path2348_2_" - d="m -770.862,232.486 c -0.122,-0.08 -0.285,-0.046 -0.365,0.077 -0.08,0.121 -0.047,0.284 0.075,0.364 l 0,0 c 0.123,0.081 0.286,0.047 0.366,-0.076 0.081,-0.121 0.045,-0.285 -0.076,-0.365 l 0,0 z" - style="fill:#ffffff" /> - </g> - <path - id="path3202_2_" - d="m -9.463,9.623 -0.915,0.257 0.679,0.663 0.236,-0.92 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3203_2_" - d="M 10.441,9.786 9.523,9.545 9.774,10.462 10.441,9.786 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3204_2_" - d="m 10.464,-9.764 -0.667,-0.678 -0.253,0.918 0.92,-0.24 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3205_2_" - d="m -9.783,-10.432 -0.677,0.666 0.916,0.253 -0.239,-0.919 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="49.75" - cy="50.25" - r="35.25" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop79" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop81" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop83" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop85" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop87" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop89" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop91" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop93" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop95" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="49.75" - cy="50.25" - r="35.25" - id="circle97" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="49.75" - sodipodi:cy="50.25" - sodipodi:rx="35.25" - sodipodi:ry="35.25" - d="M 85,50.25 C 85,69.718037 69.218037,85.5 49.75,85.5 30.281963,85.5 14.5,69.718037 14.5,50.25 14.5,30.781963 30.281963,15 49.75,15 69.218037,15 85,30.781963 85,50.25 z" /> - - <use - xlink:href="#compass" - width="38.639" - height="38.639" - id="XMLID_1_" - x="-19.32" - y="-19.32" - transform="matrix(1.69,0,0,-1.69,49.7705,50.3506)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/go-anywhere_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,731 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100" - height="100" - viewBox="0 0 99.999998 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere.svg"><metadata - id="metadata75"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs73"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 150.125 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="312.28101 : 150.125 : 1" - inkscape:persp3d-origin="156.1405 : 100.08333 : 1" - id="perspective77" /><filter - id="filter2845" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2847" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2849" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2851" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2853" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2855" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2857" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2859" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2861" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2863" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2865" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2867" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2869" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2871" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2873" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2875" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2877" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2879" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2881" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2883" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2885" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2887" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2889" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2891" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2893" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2895" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2897" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2899" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2901" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2903" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2905" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2907" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2909" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2911" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2913" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2915" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2917" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2919" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2921" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2923" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2925" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2927" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2929" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2931" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2933" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2935" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2937" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2939" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2941" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2943" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2945" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2947" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2949" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2951" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2953" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2955" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2957" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2959" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2961" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2963" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2965" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2967" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2969" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2971" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2973" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2975" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2977" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2979" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2981" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2983" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2985" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2987" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2989" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2991" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2993" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2995" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2997" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2999" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3001" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3003" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3005" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3007" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3009" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3011" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3013" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3015" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3017" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3019" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3021" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3023" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3025" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3027" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3029" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3031" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3033" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3035" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3037" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3039" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3041" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter3043" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3045" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3047" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#710000" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview71" - showgrid="false" - inkscape:zoom="3.1440466" - inkscape:cx="6.1305334" - inkscape:cy="67.030966" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<path - style="fill:#848484;filter:url(#filter2845)" - d="M 76.597602,51.708266 C 76.441488,48.132361 75.92573,44.523279 74.60195,41.194536 73.351375,38.050656 71.448061,35.054433 69.162088,32.622624 66.81927,30.129953 64.21691,28.068164 61.147871,26.64605 58.055541,25.21211 54.758293,24.27278 51.36954,24.0709 c -6.377101,-0.381267 -12.877872,1.838568 -17.885163,5.943118 -4.766049,3.907575 -8.180591,9.535469 -9.520452,15.690277 -1.456879,6.693253 -0.374895,14.133755 3.065156,20.014869 0.864034,1.476917 1.757737,2.938828 2.895455,4.206647 1.12219,1.25023 2.318139,2.46354 3.610308,3.523137 2.577128,2.113119 5.519999,3.711456 8.658914,4.708173 6.224592,1.97671 13.030103,1.499697 18.938862,-1.339919 5.458719,-2.624757 10.221718,-7.367251 12.795794,-13.042732 0.81939,-1.806846 1.398371,-3.73136 1.869208,-5.664234 0.517144,-2.120338 0.704869,-4.221361 0.79998,-6.40197" - id="path3" /> -<path - style="fill:#848484;filter:url(#filter2851)" - d="m 76.531052,51.639043 c 0,6.700471 -2.380529,13.304321 -6.641079,18.336955 -2.149547,2.539677 -4.88889,4.878331 -7.822056,6.35265 -3.062105,1.540066 -6.308887,2.563609 -9.697085,2.910849 -6.617789,0.679188 -13.470162,-1.435379 -18.709822,-5.693079 -4.750521,-3.861712 -8.370256,-9.622559 -9.626654,-15.772462 -0.694887,-3.401137 -0.930583,-7.185273 -0.324429,-10.61957 0.595896,-3.377204 1.703389,-6.822462 3.45669,-9.740529 1.726681,-2.873357 3.859868,-5.55291 6.487184,-7.580664 1.321006,-1.019219 2.710226,-1.963453 4.145476,-2.799533 1.474347,-0.859146 3.091776,-1.395867 4.706432,-1.894802 6.40372,-1.978443 13.620452,-1.354051 19.542798,1.897687 1.431368,0.786475 2.86218,1.65082 4.146862,2.680705 1.28995,1.033637 2.487009,2.30059 3.579805,3.553125 2.191695,2.511699 3.83214,5.346411 4.97679,8.515384 0.976613,2.70695 1.739159,5.723649 1.778257,8.635365 0.005,0.373477 0.0055,0.747544 -0.0011,1.121307 -0.0039,0.203899 -1.457987,0.09748 -1.696179,0.09748 -1.654586,0 -3.309172,0 -4.96348,0 -6.635811,0 -13.27079,0 -19.907157,0 8.8569,-8.66e-4 17.711858,-8.66e-4 26.568756,-8.66e-4" - id="path5" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2857)" - d="m 23.362099,51.639043 c 0,6.700471 2.380529,13.304321 6.64108,18.336955 2.149546,2.539677 4.888889,4.878331 7.822056,6.35265 3.062105,1.540066 6.308886,2.563609 9.697085,2.910849 6.617788,0.679188 13.470162,-1.435379 18.709821,-5.693079 4.750521,-3.861712 8.370257,-9.622559 9.626654,-15.772462 0.694888,-3.401137 0.930583,-7.185273 0.324429,-10.61957 -0.595896,-3.377204 -1.703389,-6.822462 -3.45669,-9.740529 -1.72668,-2.873357 -3.859867,-5.55291 -6.487184,-7.580664 -1.321006,-1.019219 -2.710226,-1.963453 -4.145475,-2.799533 -1.474347,-0.859146 -3.091776,-1.395867 -4.706433,-1.894802 -6.40372,-1.978443 -13.620452,-1.354051 -19.542797,1.897687 -1.431368,0.786475 -2.862181,1.65082 -4.146863,2.680705 -1.289949,1.033637 -2.487008,2.30059 -3.579805,3.553125 -2.191695,2.511699 -3.832139,5.346411 -4.976789,8.515384 -1.14576,3.170706 -1.779089,6.458785 -1.779089,9.853284" - id="path7" /> -<path - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2863)" - d="m 69.937112,51.708266 c -0.177189,-3.51189 -0.851279,-6.847841 -2.5042,-9.944134 -1.523982,-2.854901 -3.660219,-5.339202 -6.255925,-7.181521 -5.409084,-3.839219 -12.592541,-4.775377 -18.668228,-2.123803 -2.989179,1.304445 -5.867166,3.353844 -7.918274,5.98379 -2.028649,2.601683 -3.453916,5.764018 -4.129671,9.029023 -0.720675,3.479873 -0.514371,6.962337 0.483038,10.361749 0.483593,1.649373 1.113871,3.248568 2.008407,4.704135 0.42148,0.686683 0.858211,1.370489 1.353726,2.001518 0.50134,0.638524 0.999351,1.37424 1.598851,1.914419 1.247524,1.125059 2.499486,2.235985 3.924753,3.114463 1.432754,0.8828 2.971433,1.582177 4.569452,2.070731 3.246225,0.991535 6.828804,1.115259 10.114406,0.247743 1.675105,-0.442128 3.244561,-0.978555 4.763275,-1.850109 1.413622,-0.811273 2.653105,-1.686293 3.862641,-2.801544 2.420459,-2.231662 4.339579,-5.072725 5.477019,-8.227852 0.839078,-2.330007 1.19484,-4.824402 1.32073,-7.298608" - id="path9" /> -<path - style="fill:#ffffff;fill-opacity:0.01739131000000000;filter:url(#filter2869)" - d="m 69.870286,51.708266 c -0.213791,3.44641 -0.791385,6.774009 -2.36833,9.849541 -1.452442,2.834998 -3.702922,5.308337 -6.208231,7.176322 -1.308528,0.975089 -2.77622,1.686293 -4.261105,2.319627 -1.542284,0.657274 -3.046023,0.94452 -4.688963,1.180141 -1.655694,0.237648 -3.347991,0.239381 -5.005349,0.01152 -1.605229,-0.220623 -3.318877,-0.602184 -4.807366,-1.276467 -2.944536,-1.333291 -5.583498,-3.213389 -7.653186,-5.77296 -2.079116,-2.570827 -3.64996,-5.640302 -4.333756,-8.938762 -1.35844,-6.552806 0.345503,-13.68674 4.746639,-18.634875 4.205648,-4.728648 10.530063,-7.305531 16.70613,-6.550206 1.625192,0.198709 3.195759,0.453661 4.713364,1.109774 1.449946,0.626705 2.886027,1.308197 4.215629,2.182065 2.676675,1.758678 4.764387,4.349114 6.380428,7.150943 1.802104,3.121672 2.342818,6.615678 2.564096,10.193315 -6.635535,0 -13.270792,0 -19.906326,0 6.635534,0 13.271068,0 19.906326,0" - id="path11" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2875)" - d="m 69.870286,51.708266 c -0.213791,3.44641 -0.791385,6.774009 -2.36833,9.849541 -1.452442,2.834998 -3.702922,5.308337 -6.208231,7.176322 -1.308528,0.975089 -2.77622,1.686293 -4.261105,2.319627 -1.542284,0.657274 -3.046023,0.94452 -4.688963,1.180141 -1.655694,0.237648 -3.347991,0.239381 -5.005349,0.01152 -1.605229,-0.220623 -3.318877,-0.602184 -4.807366,-1.276467 -2.944536,-1.333291 -5.583498,-3.213389 -7.653186,-5.77296 -2.079116,-2.570827 -3.64996,-5.640302 -4.333756,-8.938762 -1.35844,-6.552806 0.345503,-13.68674 4.746639,-18.634875 4.205648,-4.728648 10.530063,-7.305531 16.70613,-6.550206 1.625192,0.198709 3.195759,0.453661 4.713364,1.109774 1.449946,0.626705 2.886027,1.308197 4.215629,2.182065 2.676675,1.758678 4.764387,4.349114 6.380428,7.150943 1.802104,3.121672 2.342818,6.615678 2.564096,10.193315" - id="path13" /> -<path - style="fill:#010101;filter:url(#filter2881)" - d="m 50.023577,51.154527 c -0.02163,-14.822466 -0.04464,-29.644931 -0.06655,-44.4676916 1.306033,7.4725186 2.613175,14.9450376 3.91893,22.4178506 0.652185,3.727893 1.303539,7.456082 1.955723,11.184556 0.155836,0.891448 0.31195,1.78261 0.467509,2.674648 0.07847,0.445291 0.155837,0.891448 0.234032,1.336748 0.09539,0.543636 0.0055,0.562091 -0.343284,0.925483 -1.255289,1.305884 -2.511409,2.612063 -3.767252,3.917955 -0.821609,0.854537 -1.643217,1.709653 -2.465103,2.56419 0.02191,-0.184872 0.04381,-0.368868 0.06599,-0.553739" - id="path15" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2887)" - d="m 50.023577,51.154527 c -0.02163,-14.822466 -0.04464,-29.644931 -0.06655,-44.4676916 1.306033,7.4725186 2.613175,14.9450376 3.91893,22.4178506 0.652185,3.727893 1.303539,7.456082 1.955723,11.184556 0.155836,0.891448 0.31195,1.78261 0.467509,2.674648 0.07847,0.445291 0.155837,0.891448 0.234032,1.336748 0.09539,0.543636 0.0055,0.562091 -0.343284,0.925483 -1.255289,1.305884 -2.511409,2.612063 -3.767252,3.917955 -0.821609,0.854537 -1.643217,1.709653 -2.465103,2.56419" - id="path17" /> -<path - style="fill:#010101;filter:url(#filter2893)" - d="m 50.023577,51.154527 c 14.430137,0.184871 28.859721,0.369448 43.289581,0.553739 -7.198154,1.345109 -14.396308,2.690218 -21.595017,4.035336 -3.591175,0.670818 -7.181794,1.342224 -10.773801,2.013051 -0.859042,0.16035 -1.717252,0.320414 -2.576295,0.481059 -0.429244,0.07989 -0.858765,0.160922 -1.288009,0.241097 -0.524354,0.09806 -0.544873,0.0026 -0.897308,-0.359926 -1.266103,-1.303865 -2.533038,-2.608605 -3.799141,-3.911898 -0.542101,-0.558349 -1.083647,-1.116698 -1.625747,-1.675333 -0.23431,-0.239944 -0.521582,-0.472117 -0.710693,-0.752439 -0.123671,-0.182558 -0.04797,-0.422797 -0.02358,-0.624686" - id="path19" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2899)" - d="m 50.023577,51.154527 c 14.430137,0.184871 28.859721,0.369448 43.289581,0.553739 -7.198154,1.345109 -14.396308,2.690218 -21.595017,4.035336 -3.591175,0.670818 -7.181794,1.342224 -10.773801,2.013051 -0.859042,0.16035 -1.717252,0.320414 -2.576295,0.481059 -0.429244,0.07989 -0.858765,0.160922 -1.288009,0.241097 -0.524354,0.09806 -0.544873,0.0026 -0.897308,-0.359926 -1.266103,-1.303865 -2.533038,-2.608605 -3.799141,-3.911898 -0.808853,-0.833767 -1.617984,-1.664952 -2.426559,-2.498719" - id="path21" /> -<path - style="fill:#010101;filter:url(#filter2905)" - d="m 50.023577,51.154527 c -14.42986,0.184871 -28.860275,0.370028 -43.2901348,0.553739 7.1881718,-1.361841 14.3763438,-2.723682 21.5645148,-4.084943 3.581192,-0.678901 7.162661,-1.356936 10.743853,-2.035543 0.845733,-0.160065 1.691465,-0.320423 2.53692,-0.480773 0.422866,-0.07963 0.845733,-0.160065 1.268599,-0.239954 0.457804,-0.08709 0.46446,-0.07148 0.76615,0.243991 1.263331,1.313968 2.526661,2.627642 3.789991,3.94161 0.851002,0.885106 1.702556,1.770792 2.553558,2.655612 0.02247,-0.184872 0.04436,-0.368868 0.06654,-0.553739" - id="path23" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2911)" - d="m 50.023577,51.154527 c -14.42986,0.184871 -28.860275,0.370028 -43.2901348,0.553739 7.1881718,-1.361841 14.3763438,-2.723682 21.5645148,-4.084943 3.581192,-0.678901 7.162661,-1.356936 10.743853,-2.035543 0.845733,-0.160065 1.691465,-0.320423 2.53692,-0.480773 0.422866,-0.07963 0.845733,-0.160065 1.268599,-0.239954 0.457804,-0.08709 0.46446,-0.07148 0.76615,0.243991 1.263331,1.313968 2.526661,2.627642 3.789991,3.94161 0.851002,0.885106 1.702556,1.770792 2.553558,2.655612" - id="path25" /> -<path - style="fill:#010101;filter:url(#filter2917)" - d="m 50.023577,51.154527 c -1.238374,1.364146 -2.476748,2.728872 -3.715122,4.093304 -0.594509,0.654969 -1.189016,1.309064 -1.783249,1.964605 -0.285607,0.314644 -0.571769,0.629582 -0.857378,0.944234 -0.373786,0.411836 -0.369627,0.414722 -0.262038,0.973356 0.71291,3.714923 1.426099,7.429836 2.13901,11.145045 1.428039,7.440797 2.855803,14.881299 4.28412,22.321229 0.0427,0.223803 0.08569,0.447605 0.128385,0.670255 0,-7.017428 0,-14.034848 0,-21.052267 0,-3.560334 0,-7.120374 0,-10.681003 0,-1.71311 0,-3.427668 0,-5.140492 -2.77e-4,-1.725805 -0.139754,-3.523709 0.06627,-5.238266" - id="path27" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2923)" - d="m 50.023577,51.154527 c -1.238374,1.364146 -2.476748,2.728872 -3.715122,4.093304 -0.594509,0.654969 -1.189016,1.309064 -1.783249,1.964605 -0.285607,0.314644 -0.571769,0.629582 -0.857378,0.944234 -0.373786,0.411836 -0.369627,0.414722 -0.262038,0.973356 0.71291,3.714923 1.426099,7.429836 2.13901,11.145045 1.428039,7.440797 2.855803,14.881299 4.28412,22.321229 0.0427,0.223803 0.08569,0.447605 0.128385,0.670255 0,-13.852862 0,-27.705437 0,-41.55887" - id="path29" /> -<path - style="fill:#ffffff;filter:url(#filter2929)" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -1.680928,0.856269 -3.361578,1.712825 -5.042507,2.569094 -0.362971,0.184871 -0.725388,0.369448 -1.088083,0.554311 -0.356316,0.181405 -0.530177,0.193519 -0.530177,0.608821 0,1.064206 0,2.128699 0,3.1932 -0.02218,-0.115944 -0.04436,-0.230726 -0.06654,-0.346374" - id="path31" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2935)" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -1.680928,0.856269 -3.361578,1.712825 -5.042507,2.569094 -0.362971,0.184871 -0.725388,0.369448 -1.088083,0.554311 -0.356316,0.181405 -0.530177,0.193519 -0.530177,0.608821 0,1.064206 0,2.128699 0,3.1932" - id="path33" /> -<path - style="fill:#010101;filter:url(#filter2941)" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -0.930583,1.934903 -1.861166,3.870082 -2.791472,5.804404 -0.130602,0.271381 -0.311395,0.938169 -0.558182,1.101119 -0.208246,0.137856 -0.745077,0.01958 -0.973009,0.01958 -0.502172,0 -1.004065,0 -1.50679,0 -0.24041,0 -0.48082,0 -0.722062,0 -0.18717,0 -0.150569,-0.215441 -0.175801,-0.346088" - id="path35" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2947)" - d="m 56.550137,44.435609 c 2.242438,-2.193018 4.4846,-4.386321 6.727316,-6.579052 -0.840187,1.747432 -1.680928,3.495158 -2.521114,5.24259 -0.181348,0.377229 -0.363249,0.754753 -0.544597,1.131982 -0.17996,0.374058 -0.19327,0.550854 -0.597557,0.550854 -0.999075,0 -1.998148,0 -2.997499,0" - id="path37" /> -<path - style="fill:#ffffff;filter:url(#filter2953)" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 0.828263,1.722339 1.656248,3.444105 2.484512,5.166738 0.184952,0.385019 0.370182,0.770324 0.555411,1.155343 0.159718,0.332241 0.184952,0.603336 0.562898,0.603336 0.996854,0 1.993986,0 2.990842,0" - id="path39" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2959)" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 1.109989,2.30838 2.219978,4.616751 3.329967,6.925417" - id="path41" /> -<path - style="fill:#010101;filter:url(#filter2965)" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 1.680651,0.856269 3.361578,1.712825 5.042229,2.569094 0.362695,0.184863 0.725667,0.369448 1.088361,0.554311 0.356871,0.181986 0.531009,0.192072 0.523245,0.608821 -0.02024,1.064492 -0.04021,2.128985 -0.06017,3.193191" - id="path43" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2971)" - d="m 43.230543,44.781688 c -2.197795,-2.308371 -4.395868,-4.617037 -6.593663,-6.925417 2.219978,1.131402 4.439956,2.261946 6.660212,3.393347" - id="path45" /> -<path - style="fill:#ffffff;filter:url(#filter2977)" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.179866,-0.601031 2.360009,-1.202634 3.54043,-1.803674 0.589795,-0.301092 1.179865,-0.601318 1.769938,-0.902124 0.321101,-0.163521 1.386446,-0.478745 1.367037,-0.916827 -0.01719,-0.39079 0.181901,-3.269337 -0.08375,-3.304239" - id="path47" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2983)" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.680651,-0.855975 3.361578,-1.712539 5.042229,-2.568513 0.362695,-0.185158 0.725667,-0.369448 1.088361,-0.554606 0.355762,-0.181405 0.529622,-0.193805 0.529622,-0.608526 0,-1.064778 0,-2.129851 0,-3.194352" - id="path49" /> -<path - style="fill:#010101;filter:url(#filter2989)" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 0.827986,-1.722338 1.656248,-3.444391 2.484512,-5.167605 0.184952,-0.385304 0.370182,-0.770323 0.555411,-1.155342 0.159718,-0.332233 0.184952,-0.603917 0.562898,-0.603917 0.996854,0 1.993986,0 2.990842,0" - id="path51" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter2995)" - d="m 43.230543,58.56504 c -2.197795,2.309533 -4.395868,4.617912 -6.593663,6.926864 1.109989,-2.308952 2.219978,-4.617331 3.329967,-6.926864" - id="path53" /> -<path - style="fill:#ffffff;filter:url(#filter3001)" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 C 62.437266,63.743892 61.596525,61.99646 60.756339,60.248162 60.574991,59.870647 60.39309,59.493704 60.211742,59.115894 60.034,58.747312 60.020968,58.56504 59.620285,58.56504 c -1.022921,0 -2.045841,0 -3.070148,0" - id="path55" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter3007)" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 -1.110543,-2.308952 -2.22081,-4.617331 -3.330522,-6.926864" - id="path57" /> -<path - style="fill:#010101;filter:url(#filter3013)" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 C 61.596525,64.635929 59.915875,63.779365 58.234946,62.923391 57.871975,62.738233 57.509558,62.553943 57.146863,62.368785 56.791656,62.18796 56.61835,62.173828 56.609754,61.760259 56.590345,60.6949 56.570372,59.630408 56.55014,58.56504" - id="path59" /> -<path - style="fill:none;stroke:#010101;stroke-width:0.06792653000000000;stroke-linecap:square;stroke-miterlimit:10;filter:url(#filter3019)" - d="m 56.550137,58.56504 c 2.242438,2.309533 4.4846,4.617912 6.727316,6.926864 -2.22081,-1.131401 -4.440234,-2.261945 -6.660767,-3.393347" - id="path61" /> -<path - style="fill:#ffffff;filter:url(#filter3025)" - d="m 49.957028,51.500615 c 0,13.92178 0,27.844436 0,41.766226 1.418889,-7.394943 2.838887,-14.790172 4.2575,-22.185107 0.710416,-3.699638 1.421109,-7.399267 2.13097,-11.099476 0.08152,-0.426549 0.1636,-0.854537 0.245678,-1.281086 0.05324,-0.277445 -0.402347,-0.590651 -0.576208,-0.774941 -0.644975,-0.684378 -1.290504,-1.369336 -1.935757,-2.053714 -1.271926,-1.349147 -2.543575,-2.698589 -3.816333,-4.048317 -0.102319,-0.107573 -0.204085,-0.216012 -0.30585,-0.323585" - id="path63" /> -<path - style="fill:#ffffff;filter:url(#filter3031)" - d="m 49.957028,51.500615 c 14.452598,0.06897 28.904641,0.137856 43.35613,0.207651 -7.181794,-1.356365 -14.36442,-2.711274 -21.546769,-4.066773 -3.587569,-0.677454 -7.176525,-1.354632 -10.764372,-2.032086 -0.827431,-0.156312 -1.654863,-0.312625 -2.481462,-0.468365 -0.413716,-0.07816 -0.826876,-0.156313 -1.241702,-0.234183 -0.443386,-0.08396 -0.600887,-0.184863 -0.91866,0.133819 -1.26444,1.276467 -2.529155,2.55179 -3.793872,3.827685 -0.869857,0.877611 -1.738881,1.755508 -2.609293,2.632252" - id="path65" /> -<path - style="fill:#ffffff;filter:url(#filter3037)" - d="m 50.090126,51.500615 c -14.45232,0.06897 -28.904364,0.137856 -43.3566838,0.207651 7.1881718,1.348566 14.3763438,2.69657 21.5645148,4.043698 3.581192,0.671398 7.162661,1.343376 10.743853,2.014783 0.845733,0.158912 1.691465,0.317243 2.53692,0.476155 0.422866,0.07902 0.845733,0.158617 1.268599,0.237354 0.453923,0.08509 0.459746,0.07408 0.758664,-0.236782 1.254734,-1.305884 2.510578,-2.611196 3.766144,-3.916508 0.906182,-0.94193 1.812363,-1.883564 2.717989,-2.826351" - id="path67" /> -<path - style="fill:#ffffff;filter:url(#filter3043)" - d="m 49.957028,51.500615 c 0,-14.938114 0,-29.875951 0,-44.8137796 -1.306033,7.4725186 -2.612897,14.9450376 -3.919208,22.4178506 -0.65163,3.727893 -1.303814,7.456082 -1.955445,11.184556 -0.155835,0.891448 -0.311673,1.78261 -0.467509,2.674648 -0.07791,0.445291 -0.155836,0.891448 -0.234032,1.336748 -0.09566,0.548254 -0.0014,0.564405 0.355762,0.924902 1.277195,1.28859 2.554944,2.576884 3.832139,3.866331 0.796374,0.802912 1.591918,1.606118 2.388293,2.408744" - id="path69" /> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/svg_toolbar_convert.sh --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/svg_toolbar_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=40 -ICON_HEIGHT=40 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular" /> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1099 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.96059989999999829px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">1</text> - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows1_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1182 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2961" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2963" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2965" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2967" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2969" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2971" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2973" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2975" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2977" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2979" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2981" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2983" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2985" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2987" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2989" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter2961)" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)" - style="filter:url(#filter2967)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.96059989999999829px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular;filter:url(#filter2973)" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">1</text> - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999;filter:url(#filter2979)"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842" - style="filter:url(#filter2985)"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows2.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">2</text> - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows2_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows2_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2961" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2963" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2965" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2967" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2969" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2971" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2973" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2975" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2977" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2979" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2981" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2983" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2985" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2987" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2989" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter2961)" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)" - style="filter:url(#filter2967)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;filter:url(#filter2973);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">2</text> - - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999;filter:url(#filter2979)"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842" - style="filter:url(#filter2985)"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows3.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">3</text> - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows3_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows3_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2961" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2963" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2965" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2967" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2969" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2971" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2973" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2975" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2977" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2979" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2981" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2983" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2985" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2987" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2989" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter2961)" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)" - style="filter:url(#filter2967)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;filter:url(#filter2973);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">3</text> - - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999;filter:url(#filter2979)"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842" - style="filter:url(#filter2985)"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows4.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">4</text> - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows4_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows4_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2961" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2963" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2965" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2967" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2969" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2971" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2973" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2975" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2977" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2979" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2981" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2983" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2985" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2987" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2989" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter2961)" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)" - style="filter:url(#filter2967)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;filter:url(#filter2973);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">4</text> - - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999;filter:url(#filter2979)"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842" - style="filter:url(#filter2985)"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows5.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">5</text> - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows5_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1183 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows5_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - -<inkscape:perspective - id="perspective3738" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3766" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3788" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective4267" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2961" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2963" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2965" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2967" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2969" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2971" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2973" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2975" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2977" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2979" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2981" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2983" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2985" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2987" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2989" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ff0000" - id="base" - showgrid="false" - inkscape:zoom="4.0729351" - inkscape:cx="19.095188" - inkscape:cy="43.464062" - inkscape:window-x="131" - inkscape:window-y="235" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <rect - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter2961)" - id="rect2960" - width="46.15836" - height="34.618771" - x="20.623947" - y="25.851997" - transform="matrix(0.64589987,0,0,0.64590016,13.999998,21.500986)" - rx="0.18867809" - ry="0.16522118" /><symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - - - - - -<g - id="g3804" - transform="translate(-10.942254,-23.946103)" - style="filter:url(#filter2967)"><g - id="g3833"><path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none" - d="m 46.291077,68.901396 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 28.520517,0 c 0.929831,0 1.675303,-0.659228 1.675303,-1.47346 l 0,-25.230475 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520517,0 z" - id="path5832" /><path - id="path5872" - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 66.394711,71.384074 c 0.619309,0 1.110141,0.490834 1.110141,1.110141 0,0.619308 -0.490832,1.130326 -1.110141,1.130326 -0.619308,0 -1.130324,-0.511018 -1.130324,-1.130326 0,-0.619307 0.511016,-1.110141 1.130324,-1.110141 z m 2.967103,0 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130326 -1.130325,1.130326 -0.619308,0 -1.130325,-0.511018 -1.130325,-1.130326 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z m 2.967102,0 c 0.619309,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511016,1.130326 -1.130325,1.130326 -0.619301,0 -1.11014,-0.511018 -1.11014,-1.130326 0,-0.619307 0.490839,-1.110141 1.11014,-1.110141 z" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 47.381033,75.461319 26.50208,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,18.044836 c 0,0.493343 -0.46134,0.888112 -1.029403,0.888112 l -26.50208,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888112 l 0,-18.044836 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 z" - id="rect2956" /></g></g><text - style="font-size:21.9605999px;fill:#000000;fill-opacity:1;filter:url(#filter2973);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">5</text> - - - -<g - transform="translate(-29.337927,11.259427)" - id="g4312" - style="fill:#999999;filter:url(#filter2979)"><g - id="g4314" - style="fill:#999999"><path - style="opacity:0.98999999000000005;fill:#848484;fill-opacity:1;stroke:none" - d="m 57.224772,22.432925 c -0.929831,0 -1.695487,0.659227 -1.695487,1.473459 l 0,25.230475 c 0,0.814232 0.765656,1.47346 1.695487,1.47346 l 5.934205,0 0,-1.79641 -4.844249,0 c -0.568062,0 -1.029403,-0.394769 -1.029403,-0.888113 l 0,-18.044835 c 0,-0.493344 0.461341,-0.888113 1.029403,-0.888113 l 26.502079,0 c 0.568063,0 1.029403,0.394769 1.029403,0.888113 l 0,3.875401 1.574381,0 0,-9.849978 c 0,-0.814232 -0.745472,-1.473459 -1.675303,-1.473459 l -28.520516,0 z" - id="path5818" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 77.328406,24.915603 c 0.619308,0 1.11014,0.490834 1.11014,1.110141 0,0.619308 -0.490832,1.130325 -1.11014,1.130325 -0.619309,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511016,-1.110141 1.130325,-1.110141 z" - id="path5816" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 80.295508,24.915603 c 0.619308,0 1.130325,0.490834 1.130325,1.110141 0,0.619308 -0.511017,1.130325 -1.130325,1.130325 -0.619308,0 -1.130325,-0.511017 -1.130325,-1.130325 0,-0.619307 0.511017,-1.110141 1.130325,-1.110141 z" - id="path5814" /><path - style="opacity:0.98999999000000005;fill:#ffffff;fill-opacity:1;stroke:none" - d="m 83.262611,24.915603 c 0.619309,0 1.130324,0.490834 1.130324,1.110141 0,0.619308 -0.511015,1.130325 -1.130324,1.130325 -0.619301,0 -1.110141,-0.511017 -1.110141,-1.130325 0,-0.619307 0.49084,-1.110141 1.110141,-1.110141 z" - id="path4316" /></g></g><g - id="g3842" - style="filter:url(#filter2985)"><g - id="g3844" /></g></g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,638 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows_disabled.svg"><metadata - id="metadata118"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs116"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective120" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2946" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2948" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2950" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2952" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2954" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2960" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2962" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2964" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview114" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="switchwindows_x5F_icon" - viewBox="-10.363 -10.473 20.727 20.945"> - <g - id="layer1_4_"> - <g - id="g5526_6_"> - <g - id="g5022_6_" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - style="opacity:0.58730002"> - - <linearGradient - id="rect4173_1_" - gradientUnits="userSpaceOnUse" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop14" /> - <stop - offset="0.5" - style="stop-color:#010101" - id="stop16" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop18" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </linearGradient> - <polygon - id="rect4173_5_" - points="-1834.583,-3497.024 -2343.865,-3497.024 -2343.865,-3315.15 -1834.583,-3315.15 " - style="opacity:0.40209997;fill:url(#linearGradient2946)" /> - - <radialGradient - id="path5058_1_" - cx="-5692351" - cy="-25844636" - r="44.5518" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop22" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop24" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5058_6_" - d="m -1834.583,-3315.15 v -181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - style="opacity:0.40209997;fill:url(#radialGradient2948)" /> - - <radialGradient - id="path5018_1_" - cx="6469965.5" - cy="-25844636" - r="44.560299" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop28" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop30" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5018_6_" - d="m -2343.865,-3315.15 v -181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - style="opacity:0.40209997;fill:url(#radialGradient2950)" /> - </g> - - <linearGradient - id="rect1887_1_" - gradientUnits="userSpaceOnUse" - x1="1661.9604" - y1="-15099.52" - x2="1661.9277" - y2="-15087.603" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)"> - <stop - offset="0" - style="stop-color:#C4C6C8" - id="stop34" /> - <stop - offset="0.1322" - style="stop-color:#DADCDD" - id="stop36" /> - <stop - offset="1" - style="stop-color:#8C8C8C" - id="stop38" /> - <a:midPointStop - offset="0" - style="stop-color:#C4C6C8" /> - <a:midPointStop - offset="0.5" - style="stop-color:#C4C6C8" /> - <a:midPointStop - offset="0.1322" - style="stop-color:#DADCDD" /> - <a:midPointStop - offset="0.5" - style="stop-color:#DADCDD" /> - <a:midPointStop - offset="1" - style="stop-color:#8C8C8C" /> - </linearGradient> - <path - id="rect1887_5_" - d="M -9.033,9.972 H 5.033 c 0.421,0 0.761,-0.341 0.761,-0.76 V -2.953 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 H -9.033 c -0.419,0 -0.76,0.341 -0.76,0.761 V 9.212 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - style="fill:url(#linearGradient2952);stroke:#c9c9c9;stroke-width:1.00010002" /> - <path - id="rect2779_5_" - d="M -9.033,9.592 H 5.033 c 0.211,0 0.381,-0.17 0.381,-0.38 V -2.953 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 H -9.033 c -0.209,0 -0.38,0.171 -0.38,0.381 V 9.212 c 0,0.21 0.171,0.38 0.38,0.38 z" - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" /> - - <linearGradient - id="rect6287_1_" - gradientUnits="userSpaceOnUse" - x1="115.6006" - y1="-16289.222" - x2="115.6006" - y2="-16278.958" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - id="stop43" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" /> - </linearGradient> - <path - id="rect6287_5_" - d="M -8.842,7.12 H 4.843 c 0.21,0 0.38,-0.17 0.38,-0.38 v -9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 H -8.842 c -0.21,0 -0.38,0.171 -0.38,0.381 V 6.74 c 0,0.21 0.17,0.38 0.38,0.38 z" - style="fill:url(#linearGradient2954)" /> - <path - id="path6289_5_" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6291_5_" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6293_5_" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - </g> - </g> - <g - id="layer1_3_"> - <g - id="g5526_5_"> - <g - id="g5022_3_" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - style="opacity:0.58730002"> - - <linearGradient - id="rect4173_2_" - gradientUnits="userSpaceOnUse" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop55" /> - <stop - offset="0.5" - style="stop-color:#010101" - id="stop57" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop59" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </linearGradient> - <polygon - id="rect4173_3_" - points="-1649.997,-3975.441 -2159.278,-3975.441 -2159.278,-3793.567 -1649.997,-3793.567 " - style="opacity:0.40209997;fill:url(#linearGradient2956)" /> - - <radialGradient - id="path5058_2_" - cx="-5689279.5" - cy="-25825270" - r="44.555599" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop63" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop65" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5058_3_" - d="m -1649.997,-3793.567 v -181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - style="opacity:0.40209997;fill:url(#radialGradient2958)" /> - - <radialGradient - id="path5018_2_" - cx="6466894" - cy="-25825270" - r="44.560299" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop69" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop71" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5018_3_" - d="m -2159.278,-3793.567 v -181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - style="opacity:0.40209997;fill:url(#radialGradient2960)" /> - </g> - - <linearGradient - id="rect1887_2_" - gradientUnits="userSpaceOnUse" - x1="1665.1802" - y1="-15094.438" - x2="1665.1475" - y2="-15082.521" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)"> - <stop - offset="0" - style="stop-color:#BEC0C2" - id="stop75" /> - <stop - offset="0.1322" - style="stop-color:#CBCCCE" - id="stop77" /> - <stop - offset="1" - style="stop-color:#8C8C8C" - id="stop79" /> - <a:midPointStop - offset="0" - style="stop-color:#BEC0C2" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2" /> - <a:midPointStop - offset="0.1322" - style="stop-color:#CBCCCE" /> - <a:midPointStop - offset="0.5" - style="stop-color:#CBCCCE" /> - <a:midPointStop - offset="1" - style="stop-color:#8C8C8C" /> - </linearGradient> - <path - id="rect1887_3_" - d="M -5.033,3.971 H 9.033 c 0.421,0 0.761,-0.341 0.761,-0.76 V -8.954 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 H -5.033 c -0.419,0 -0.76,0.341 -0.76,0.761 V 3.211 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - style="fill:url(#linearGradient2962);stroke:#c9c9c9;stroke-width:1.00010002" /> - <path - id="rect2779_3_" - d="M -5.033,3.591 H 9.033 c 0.211,0 0.381,-0.17 0.381,-0.38 V -8.954 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 H -5.033 c -0.209,0 -0.38,0.171 -0.38,0.381 V 3.211 c 0,0.21 0.171,0.38 0.38,0.38 z" - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" /> - - <linearGradient - id="rect6287_2_" - gradientUnits="userSpaceOnUse" - x1="119.6006" - y1="-16283.223" - x2="119.6006" - y2="-16272.959" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - id="stop84" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - id="stop86" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" /> - </linearGradient> - <path - id="rect6287_3_" - d="M -4.842,1.119 H 8.843 c 0.21,0 0.38,-0.17 0.38,-0.38 v -9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 H -4.842 c -0.21,0 -0.38,0.171 -0.38,0.381 v 9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - style="fill:url(#linearGradient2964)" /> - <path - id="path6289_3_" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6291_3_" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6293_3_" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - </g> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop93" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop95" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop97" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop99" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop101" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop103" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop105" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop107" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop109" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle111" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="XMLID_1_" - x="-10.363" - y="-10.473" - transform="matrix(2.1206,0,0,-2.1206,45.4453,56.0293)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/windows_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1072 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /> -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - </defs><sodipodi:namedview - inkscape:window-height="870" - inkscape:window-width="994" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="19.557329" - inkscape:cy="35.78956" - inkscape:window-x="442" - inkscape:window-y="193" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.7730161;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none" - transform="matrix(0,1,-1,0,0,0)" /><rect - transform="scale(-1,-1)" - style="opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none" - id="rect2851" - width="7.6732674" - height="29.207918" - x="-46.410892" - y="-59.777229" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,373 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+_disabled.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - </defs><sodipodi:namedview - inkscape:window-height="941" - inkscape:window-width="1439" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="-24.378315" - inkscape:cy="35.78956" - inkscape:window-x="164" - inkscape:window-y="186" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:1.77301609999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999000000005;fill:#676767;fill-opacity:1;stroke:none;stroke-opacity:1" - transform="matrix(0,1,-1,0,0,0)" /><rect - transform="scale(-1,-1)" - style="opacity:0.98999999000000005;fill:#676767;fill-opacity:1;stroke:none;stroke-opacity:1" - id="rect2851" - width="7.6732674" - height="29.207918" - x="-46.410892" - y="-59.777229" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom+_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,437 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - <filter - id="filter2851" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2853" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2855" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2857" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2859" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2861" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2863" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2865" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2867" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2869" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2871" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2873" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="870" - inkscape:window-width="994" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="19.557329" - inkscape:cy="35.78956" - inkscape:window-x="88" - inkscape:window-y="194" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.77301609999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2851)" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2857)" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter2863)" - transform="matrix(0,1,-1,0,0,0)" /><rect - transform="scale(-1,-1)" - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter2869)" - id="rect2851" - width="7.6732674" - height="29.207918" - x="-46.410892" - y="-59.777229" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - </defs><sodipodi:namedview - inkscape:window-height="870" - inkscape:window-width="994" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="19.557329" - inkscape:cy="35.78956" - inkscape:window-x="442" - inkscape:window-y="193" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.7730161;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none" - transform="matrix(0,1,-1,0,0,0)" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-_disabled.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - </defs><sodipodi:namedview - inkscape:window-height="877" - inkscape:window-width="1381" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="37.42258" - inkscape:cy="35.78956" - inkscape:window-x="241" - inkscape:window-y="176" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:1.77301609999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999000000005;fill:#666666;fill-opacity:1;stroke:none;stroke-opacity:1" - transform="matrix(0,1,-1,0,0,0)" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom-_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,414 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - <filter - id="filter2850" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2852" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2854" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2856" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2858" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2860" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2862" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2864" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2866" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="870" - inkscape:window-width="994" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#a13423" - id="base" - showgrid="false" - inkscape:zoom="4.04" - inkscape:cx="19.557329" - inkscape:cy="35.78956" - inkscape:window-x="442" - inkscape:window-y="193" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2931);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2933)" /> - </symbol><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,51.866236,26.452915)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -<path - id="path4014" - d="m 42.71543,22.605258 c -12.325194,0 -22.328922,10.003727 -22.328922,22.328922 0,12.32931 10.003728,22.301218 22.328922,22.301218 12.329311,0 22.301218,-9.97328 22.301218,-22.301218 0,-12.325195 -9.971907,-22.327592 -22.301218,-22.328922 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.77301609999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2850)" /><path - id="path3820" - d="m 64.84375,63.03125 c -1.978634,0.137793 -4.08699,2.051067 -4.03125,4.03125 3.797802,5.900294 8.294245,10.699881 13.09375,15.09375 4.050163,0.2183 6.45082,-1.330832 6.03125,-6.03125 -4.392321,-4.728286 -9.523228,-9.038942 -15.09375,-13.09375 z" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2856)" /><rect - y="-57.178219" - x="41.336636" - height="29.207918" - width="7.6732674" - id="rect4020" - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter2862)" - transform="matrix(0,1,-1,0,0,0)" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata22954"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs22952"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective22956" /><radialGradient - inkscape:collect="always" - xlink:href="#path2982_2_" - id="radialGradient2846" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - cx="981.9658" - cy="-15413.6816" - r="8.3145" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_2_" - id="linearGradient2848" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="176" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch22901" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject22903"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g22905"> - <symbol - id="zoom" - viewBox="-13.119 -13.113 26.237 26.226"> - <g - id="g4042_2_" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029_1_" - nodetypes="ccccc" - d="M 2.914,-6.105 4.099,-4.92 6.073,-6.894 4.887,-8.079 2.914,-6.105 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_2_" - cx="981.96582" - cy="-15413.682" - r="8.3144999" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop22911" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop22913" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop22915" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="opacity:0.6;fill:url(#radialGradient2846)" /> - - <path - id="path2994_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.466,1.395 c 0,-5.451 -4.417,-9.868 -9.868,-9.868 -5.45,0 -9.868,4.417 -9.868,9.868 l 0,0 c 0,5.45 4.418,9.868 9.868,9.868 5.451,0 9.868,-4.418 9.868,-9.868 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080_1_" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 4.098,-7.685 c -0.02,0.777 0.804,1.525 1.579,1.58 2.184,-1.591 4.198,-3.278 5.921,-5.132 0.165,-1.843 -0.78,-2.454 -2.368,-2.368 -1.882,1.723 -3.644,3.608 -5.132,5.92 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_2_" - gradientUnits="userSpaceOnUse" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop22921" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop22923" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995_1_" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 3.378,4.601 c -1.752,-7.379 -11.66,-0.274 -13.561,-6.413 1.77,-3.742 6.243,-5.344 9.985,-3.574 3.744,1.769 5.345,6.243 3.576,9.987 z" - style="opacity:0.8;fill:url(#linearGradient2848)" /> - - <path - id="path2944_1_" - open="true" - end="4.2666097" - start="2.3770938" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - d="m -10.643,-1.746 c -1.734,3.999 0.102,8.647 4.101,10.382 0.77,0.334 1.59,0.544 2.427,0.619" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop22929" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop22931" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22933" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop22935" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop22937" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop22939" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22941" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop22943" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop22945" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle22947" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#zoom" - width="26.237" - height="26.226" - x="-13.119" - y="-13.113" - transform="matrix(1.5567,0,0,-1.5567,44.9927,52.7305)" - overflow="visible" - id="use22949" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom1.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom1.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata22954"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs22952"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective22956" /><radialGradient - inkscape:collect="always" - xlink:href="#path2982_2_" - id="radialGradient2846" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - cx="981.9658" - cy="-15413.6816" - r="8.3145" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_2_" - id="linearGradient2848" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="176" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch22901" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject22903"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g22905"> - <symbol - id="zoom" - viewBox="-13.119 -13.113 26.237 26.226"> - <g - id="g4042_2_" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029_1_" - nodetypes="ccccc" - d="M 2.914,-6.105 4.099,-4.92 6.073,-6.894 4.887,-8.079 2.914,-6.105 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_2_" - cx="981.96582" - cy="-15413.682" - r="8.3144999" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop22911" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop22913" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop22915" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="opacity:0.6;fill:url(#radialGradient2846)" /> - - <path - id="path2994_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.466,1.395 c 0,-5.451 -4.417,-9.868 -9.868,-9.868 -5.45,0 -9.868,4.417 -9.868,9.868 l 0,0 c 0,5.45 4.418,9.868 9.868,9.868 5.451,0 9.868,-4.418 9.868,-9.868 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080_1_" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 4.098,-7.685 c -0.02,0.777 0.804,1.525 1.579,1.58 2.184,-1.591 4.198,-3.278 5.921,-5.132 0.165,-1.843 -0.78,-2.454 -2.368,-2.368 -1.882,1.723 -3.644,3.608 -5.132,5.92 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_2_" - gradientUnits="userSpaceOnUse" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop22921" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop22923" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995_1_" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 3.378,4.601 c -1.752,-7.379 -11.66,-0.274 -13.561,-6.413 1.77,-3.742 6.243,-5.344 9.985,-3.574 3.744,1.769 5.345,6.243 3.576,9.987 z" - style="opacity:0.8;fill:url(#linearGradient2848)" /> - - <path - id="path2944_1_" - open="true" - end="4.2666097" - start="2.3770938" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - d="m -10.643,-1.746 c -1.734,3.999 0.102,8.647 4.101,10.382 0.77,0.334 1.59,0.544 2.427,0.619" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop22929" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop22931" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22933" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop22935" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop22937" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop22939" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22941" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop22943" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop22945" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle22947" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#zoom" - width="26.237" - height="26.226" - x="-13.119" - y="-13.113" - transform="matrix(1.5567,0,0,-1.5567,44.9927,52.7305)" - overflow="visible" - id="use22949" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/icons/zoom_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="37" - inkscape:window-y="99" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/toolbar.css --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/toolbar.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -.ToolBar { - height: 52px; - - /* Grey Gradient */ -/* - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#444444), - color-stop(30%, #afafbf), - color-stop(50%,#5c5c6c), - color-stop(100%,#110000)); -*/ - /* Blueish */ - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#222233), - color-stop(30%,#555577), - color-stop(100%,#110000)); - - /* Bluetipped */ - /* - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#111144), - color-stop(50%,#777799), - color-stop(51%,#444488), - color-stop(100%,#222233)); - */ - } - -/* CSS properties when not using table to layout */ - -.toolBarTable{ - width: 100%; - border-collapse:collapse; -} - -.toolBarBtnCell { - text-align: center; - // border: 1px solid red; - // border-left: 1px solid #AAAAAA; - // border-right: 1px solid #BBBBBB;; - } - -.toolbarBtn{ - height: 40px; - width: 40px; - margin-top: 5px; - margin-bottom: 7px; - -webkit-user-drag: none; - -webkit-user-select: none; -} - -.btnBorder{ - margin-top: 5px; - margin-bottom: 7px; - } - -/* Add extra buttons to rightmost, leftmost button to pad them */ -.lastButton{ - margin-right: 12px; -} - -.firstButton { - margin-left: 12px; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar.snippet/toolbar.js --- a/ginebra/chrome/bedrockchrome/toolbar.snippet/toolbar.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,385 +0,0 @@ - - -/* create all functions with toolbar.* */ -// -// INIT the webView Toolbar -// - -function WebViewToolbar() -{ - //Private methods - //write webview toolbar HTML code to document - function _writeWebViewToolbar() { - var html = ''+ - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=15%;"><img class="toolBarBtn" id="backButton"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=15%;"><img class="toolBarBtn" id="zoomIn"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=15%;"><img class="toolBarBtn" id="zoomOut"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=15%;"><img class="toolBarBtn" id="winButton"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=15%;"><img class="toolBarBtn" id="contextMenuButton"></td>'+ - - '</tr>'+ - '</table>'; - - document.write(html); - - // We can immediately set up the simple buttons - // ActionButtons have to wait until the page is loaded - var index = window.pageController.pageCount(); - var base = "toolbar.snippet/icons/windows" + index; - new SimpleButton("winButton", - base + ".png", - base + "_pushed.png", - base + ".png", - _goToWindowView); - - - new SimpleButton("contextMenuButton", - "toolbar.snippet/icons/go-anywhere.png", - "toolbar.snippet/icons/go-anywhere_pushed.png", - "toolbar.snippet/icons/go-anywhere.png", - _contextMenuF); - - } - - /* Adds the back action button using ActionButton from ../../js/ActionButton.js */ - function _setActions () { - new ActionButton("backButton", - "toolbar.snippet/icons/back.png", - "toolbar.snippet/icons/back_pushed.png", - "toolbar.snippet/icons/back_disabled.png", - window.pageController.actions.back); - - new ActionButton("zoomIn", - "toolbar.snippet/icons/zoom+.png", - "toolbar.snippet/icons/zoom+_pushed.png", - "toolbar.snippet/icons/zoom+_disabled.png", - window.webView.actions.zoomIn); - - - new ActionButton("zoomOut", - "toolbar.snippet/icons/zoom-.png", - "toolbar.snippet/icons/zoom-_pushed.png", - "toolbar.snippet/icons/zoom-_disabled.png", - window.webView.actions.zoomOut); - - /* Add 'addWindow' action */ - new ActionButton("addWindow", - "toolbar.snippet/icons/addwindow.png", - "toolbar.snippet/icons/addwindow_pushed.png", - "toolbar.snippet/icons/addwindow_disabled.png", - window.viewManager.windowView.actions.addWindow); - } - - var timeoutId = 0; - - function _contextMenuF () - { - var hideFlag = 0; - - hideFlag = window.snippets.ContextMenuId.getContextMenuFlag(); - - if(hideFlag == 1) - { - window.snippets.ContextMenuBgId.hide(); - window.snippets.ContextMenuId.hide(); - return; - } - - clearTimeout(timeoutId); - - window.snippets.ContextMenuBgId.setPosition(0,20); - window.snippets.ContextMenuBgId.show(); - window.snippets.ContextMenuBgId.zValue = 1; - - window.snippets.ContextMenuId.repaint(); - if (window.snippets.ContextMenuId.getDisplayMode() == "portrait") - window.snippets.ContextMenuId.setPosition(90,200); - else //landscape - window.snippets.ContextMenuId.setPosition(250,100); - - - window.snippets.ContextMenuId.show(); - window.snippets.ContextMenuId.zValue = 10; - - timeoutId = setTimeout ( 'window.snippets.ContextMenuId.hide(); window.snippets.ContextMenuBgId.hide()', 6000 ); // close the menu after 6 secs - - } - - /* Update the windows icon based on the number of windows open */ - function _changeWindowIcon () { - var index = window.pageController.pageCount(); - var base = "toolbar.snippet/icons/windows" + index; - - document.getElementById('winButton').button.updateImages(base + ".png", - base + "_pushed.png", - base + ".png"); - } - - function _goToWindowView () { - //window.chrome.alert("goToWindowView"); - window.viewStack.switchView("windowView", "webView"); - } - - function _goToGoAnywhereView () { - /* Change to history view */ - window.viewStack.switchView("goAnywhereView", "webView"); - } - - function _goToBookmarkView () { - /* Change to Bookmark view */ - window.viewStack.switchView("bookmarkTreeView", "webView"); - } - - function _goToRecentUrlView () { - window.viewStack.switchView("bookmarkHistoryView", "webView"); - } - - function _chromeLoadComplete () { - _setActions(); - _changeWindowIcon(); - - /* Connect to pageCreated signal */ - window.pageController.pageCreated.connect(_changeWindowIcon); - } - - function _activateBookmark () { - window.chrome.toggleVisibility("BookmarkViewToolbarId"); - } - - function _deActivateBookmark () { - window.chrome.toggleVisibility("BookmarkViewToolbarId"); - } - - function _activateHistory () { - window.chrome.toggleVisibility("HistoryViewToolbarId"); - } - - function _deActivateHistory () { - window.chrome.toggleVisibility("HistoryViewToolbarId"); - } - - function _activateBookMarkHistory () { - window.chrome.toggleVisibility("BookmarkHistoryViewToolbarId"); - } - - function _deActivateBookMarkHistory () { - window.chrome.toggleVisibility("BookmarkHistoryViewToolbarId"); - } - - function _activateWebView () { - window.chrome.toggleVisibility("WebViewToolbarId"); - } - - function _deActivateWebView () { - window.chrome.toggleVisibility("WebViewToolbarId"); - } - - function _activateWindowView () { - - window.chrome.alert("_activateWindowView"); - - /* Show the window count snippet */ - document.getElementById('WindowCountBarId').wcChrome.wcUpdateWindowHtml(); - window.chrome.toggleVisibility("WindowCountBarId"); - - window.chrome.toggleVisibility("WindowViewToolbarId"); - } - - function _deActivateWindowView () { - - window.chrome.toggleVisibility("WindowCountBarId"); - window.chrome.toggleVisibility("WindowViewToolbarId"); - - /* Set the windows icon based on the number of windows */ - _changeWindowIcon(); - } - - function _pageChanged() { - window.chrome.alert("_pageChanged"); - document.getElementById('WindowCountBarId').wcChrome.wcUpdateWindowHtml(); - } - - - _writeWebViewToolbar(); - window.chrome.loadComplete.connect(_chromeLoadComplete); - window.viewStack.activateBookmark.connect(_activateBookmark); - window.viewStack.deActivateBookmark.connect(_deActivateBookmark); - window.viewStack.activateHistory.connect(_activateHistory); - window.viewStack.deActivateHistory.connect(_deActivateHistory); - window.viewStack.activateBookMarkHistory.connect(_activateBookMarkHistory); - window.viewStack.deActivateBookMarkHistory.connect(_deActivateBookMarkHistory); - window.viewStack.activateWebView.connect(_activateWebView); - window.viewStack.deActivateWebView.connect(_deActivateWebView); - window.viewStack.activateWindowView.connect(_activateWindowView); - window.viewStack.deActivateWindowView.connect(_deActivateWindowView); - window.viewStack.pageChanged.connect(_pageChanged); - -} //end of class webViewToolbar - - -// INIT the History View Toolbar -function HistoryViewToolbar() -{ - //Private methods - //write historyview toolbar HTML code to document - function _writeHistoryViewToolbar() { - var tbhtml = ''+ - //'<span id="historyRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewHist">'+ - //'</span>'; - - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=100%;"><img class="toolBarBtn" id="goBacktoWebViewHist"></td>'+ - '</tr>' + - '</table>'; - document.write(tbhtml); - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewHist", - "toolbar.snippet/icons/back.png", - "toolbar.snippet/icons/back_pushed.png", - "toolbar.snippet/icons/back.png", - _goBackFromGoAnywhereView); - - } - - _goBackFromGoAnywhereView = function() { - window.viewStack.switchView("webView", "goAnywhereView"); - } - - _writeHistoryViewToolbar(); - -} //end of class HistoryViewToolbar - -// INIT the bookmark View Toolbar -function BookmarkViewToolbar() -{ - //Private methods - //write webview toolbar HTML code to document - function _writeBookmarkViewToolbar() { - var tbhtml = ''+ - //'<span id="bookmarkRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewBM">'+ - //'<img class="toolBarBtn lastButton" id="addToBookMark">'+ - //'</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="goBacktoWebViewBM"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="addToBookMark"></td>'+ - '</tr>'+ - '</table>'; - - document.write(tbhtml); - - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewBM", - "toolbar.snippet/icons/back.png", - "toolbar.snippet/icons/back_pushed.png", - "toolbar.snippet/icons/back.png", - _goBackFromBookmarkView); - - /* add bookmark button as a simple button */ - new SimpleButton("addToBookMark", - "toolbar.snippet/icons/addwindow.png", - "toolbar.snippet/icons/addwindow_pushed.png", - "toolbar.snippet/icons/addwindow.png", - _addCurrentPageToBookMark); - - } - - function _goBackFromBookmarkView () { - window.viewStack.switchView("webView", "bookmarkTreeView"); - } - - function _addCurrentPageToBookMark () { - /* Change to history view */ - window.chrome.addCurrentPageToBookMark(); - } - - - _writeBookmarkViewToolbar(); - -} - -// INIT the Bookmark History View Toolbar -function BookmarkHistoryViewToolbar() -{ - /* BookmarkHist View Toolbar */ - function _writeBookmarkHistoryViewToolbar() { - var tbhtml = ''+ - //'<span id="bookmarkHistoryRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewBMH">'+ - //'</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=100%;"><img class="toolBarBtn" id="goBacktoWebViewBMH"></td>'+ - '</tr>'+ - '</table>'; - document.write(tbhtml); - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewBMH", - "toolbar.snippet/icons/back.png", - "toolbar.snippet/icons/back_pushed.png", - "toolbar.snippet/icons/back.png", - _goBackFromRecentUrlView); - } - - /* This function changes the view to webView and updates the layout correspondingly */ - _goBackFromRecentUrlView = function() - { - window.viewStack.switchView("webView", "bookmarkHistoryView"); - } - - _writeBookmarkHistoryViewToolbar(); - -} - - -// INIT the Window View Toolbar -function WindowViewToolbar() -{ - /* Window View Toolbar */ - function _writeWindowToolbar() { - var tbhtml = ''+ - // '<span id="windowRow" style="width:100%">'+ - // '<img class="toolBarBtn firstButton" id="goBacktoWebViewWin">'+ - // '<img class="toolBarBtn" id="addWindow">'+ - // '</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="goBacktoWebViewWin"></td>'+ - '<td><img src="toolbar.snippet/icons/btnBorder.png"></td>'+ - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="addWindow"></td>'+ - '</tr>'+ - '</table>'; - - - document.write(tbhtml); - - /* add back as simple button, add window is an action button */ - new SimpleButton("goBacktoWebViewWin", - "toolbar.snippet/icons/back.png", - "toolbar.snippet/icons/back_pushed.png", - "toolbar.snippet/icons/back.png", - _goBackFromWindowView); - - } - - _goBackFromWindowView = function() { - window.viewStack.switchView("webView", "windowView"); - } - _writeWindowToolbar(); -} - - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079 - V30.631z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4126" y1="28.1445" x2="24.4126" y2="21.1201"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_4_)" points="25.394,23.65 25.394,21.12 23.431,21.12 23.431,23.65 20.9,23.65 20.9,25.614 - 23.431,25.614 23.431,28.145 25.394,28.145 25.394,25.614 27.924,25.614 27.924,23.65 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079 - V30.631z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4126" y1="28.1445" x2="24.4126" y2="21.1201"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_4_)" points="25.394,23.65 25.394,21.12 23.431,21.12 23.431,23.65 20.9,23.65 20.9,25.614 - 23.431,25.614 23.431,28.145 25.394,28.145 25.394,25.614 27.924,25.614 27.924,23.65 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/addwindow_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079V30.631z" - /> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <polygon fill="#FFFFFF" points="25.394,23.65 25.394,21.12 23.431,21.12 23.431,23.65 20.9,23.65 20.9,25.614 23.431,25.614 - 23.431,28.145 25.394,28.145 25.394,25.614 27.924,25.614 27.924,23.65 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.6304" y1="52.6143" x2="26.6304" y2="0.3599"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.63" cy="26.488" r="26.128"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.8296" y1="38.4727" x2="25.8296" y2="14.3501"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_2_)" points="37.225,20.637 26.494,20.637 26.494,14.35 14.434,26.413 26.494,38.473 26.494,32.191 - 37.225,32.191 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.6304" y1="53.8057" x2="26.6304" y2="1.5513"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle opacity="0.9" fill="url(#SVGID_1_)" cx="26.63" cy="27.68" r="26.128"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.8296" y1="39.6641" x2="25.8296" y2="15.5415"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_2_)" points="37.225,21.828 26.494,21.828 26.494,15.541 14.434,27.604 26.494,39.664 26.494,33.383 - 37.225,33.383 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/back_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.6304" y1="53.5967" x2="26.6304" y2="1.3423"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle opacity="0.9" fill="url(#SVGID_1_)" cx="26.63" cy="27.471" r="26.128"/> -<g> - <polygon fill="#FFFFFF" points="37.225,21.619 26.494,21.619 26.494,15.332 14.434,27.396 26.494,39.455 26.494,33.174 - 37.225,33.174 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.4175" y1="53.6143" x2="27.4175" y2="1.3599"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="27.417" cy="27.488" r="26.128"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="30.2812" y1="21.7734" x2="30.2812" y2="17.8418"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="20.664" y="17.842" fill="url(#SVGID_2_)" width="19.234" height="3.932"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="30.2812" y1="29.0225" x2="30.2812" y2="25.0913"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="20.664" y="25.091" fill="url(#SVGID_3_)" width="19.234" height="3.932"/> -</g> -<g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="30.2812" y1="36.2744" x2="30.2812" y2="32.3428"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="20.664" y="32.343" fill="url(#SVGID_4_)" width="19.234" height="3.932"/> -</g> -<g> - <linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.2466" y1="21.7734" x2="16.2466" y2="17.8418"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="14.911" y="17.842" fill="url(#SVGID_5_)" width="2.671" height="3.932"/> -</g> -<g> - <linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.2466" y1="29.0225" x2="16.2466" y2="25.0913"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="14.911" y="25.091" fill="url(#SVGID_6_)" width="2.671" height="3.932"/> -</g> -<g> - <linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="16.2466" y1="36.2744" x2="16.2466" y2="32.3428"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <rect x="14.911" y="32.343" fill="url(#SVGID_7_)" width="2.671" height="3.932"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1147" y1="53.5312" x2="27.1147" y2="1.2764"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="27.115" cy="27.405" r="26.127"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="27.3081" y1="38.2734" x2="27.3081" y2="15.0996"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_2_)" points="39.487,23.951 31.074,22.725 27.31,15.099 23.544,22.725 15.128,23.951 21.219,29.887 - 19.782,38.273 27.31,34.314 34.833,38.273 33.402,29.887 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/menu_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.4175" y1="53.5967" x2="27.4175" y2="1.3423"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="27.417" cy="27.471" r="26.128"/> -<g> - <rect x="20.664" y="17.824" fill="#FFFFFF" width="19.234" height="3.932"/> -</g> -<g> - <rect x="20.664" y="25.073" fill="#FFFFFF" width="19.234" height="3.932"/> -</g> -<g> - <rect x="20.664" y="32.325" fill="#FFFFFF" width="19.234" height="3.932"/> -</g> -<g> - <rect x="14.911" y="17.824" fill="#FFFFFF" width="2.671" height="3.932"/> -</g> -<g> - <rect x="14.911" y="25.073" fill="#FFFFFF" width="2.671" height="3.932"/> -</g> -<g> - <rect x="14.911" y="32.325" fill="#FFFFFF" width="2.671" height="3.932"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1147" y1="53.5312" x2="27.1147" y2="1.2764"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="27.115" cy="27.405" r="26.127"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="27.3081" y1="38.2734" x2="27.3081" y2="15.0996"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_2_)" points="39.487,23.951 31.074,22.725 27.31,15.099 23.544,22.725 15.128,23.951 21.219,29.887 - 19.782,38.273 27.31,34.314 34.833,38.273 33.402,29.887 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<g> - <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1147" y1="53.5312" x2="27.1147" y2="1.2764"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> - </linearGradient> - <circle fill="url(#SVGID_1_)" cx="27.115" cy="27.405" r="26.127"/> - <g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="27.3081" y1="38.2734" x2="27.3081" y2="15.0996"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <polygon fill="url(#SVGID_2_)" points="39.487,23.951 31.074,22.725 27.31,15.099 23.544,22.725 15.128,23.951 21.219,29.887 - 19.782,38.273 27.31,34.314 34.833,38.273 33.402,29.887 "/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/mostVisited_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.1147" y1="53.5312" x2="27.1147" y2="1.2764"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="27.115" cy="27.405" r="26.127"/> -<g> - <polygon fill="#FFFFFF" points="39.487,23.951 31.074,22.725 27.31,15.099 23.544,22.725 15.128,23.951 21.219,29.887 - 19.782,38.273 27.31,34.314 34.833,38.273 33.402,29.887 "/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/svg_toolbar_convert.sh --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/svg_toolbar_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=40 -ICON_HEIGHT=40 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079 - V30.631z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.146" y1="29.0586" x2="24.146" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M24.056,22.438h-1.331v-0.947c1.271-0.252,1.487-0.684,1.895-1.211h0.947v8.779h-1.511V22.438z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.146" y1="29.0586" x2="24.146" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M24.056,22.438h-1.331v-0.947c1.271-0.252,1.487-0.684,1.895-1.211h0.947v8.779h-1.511V22.438z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows1_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01V31.096z"/> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <text transform="matrix(1 0 0 1 21.2373 29.0586)" fill="#FFFFFF" font-family="'TradeGothicLTStd-Bold'" font-size="12">1</text> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.5112" y1="29.0586" x2="24.5112" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M21.717,29.059v-1.403c3.454-3.286,4.006-3.91,4.006-4.821c0-0.696-0.384-1.188-1.151-1.188 - c-0.803,0-1.235,0.492-1.235,1.14v0.312h-1.583V22.69c0-1.271,1.02-2.411,2.699-2.411c1.691,0,2.854,0.864,2.854,2.519 - c0,2.003-2.339,3.55-3.586,4.894h3.454v1.367H21.717z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.5112" y1="29.0586" x2="24.5112" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M21.717,29.059v-1.403c3.454-3.286,4.006-3.91,4.006-4.821c0-0.696-0.384-1.188-1.151-1.188 - c-0.803,0-1.235,0.492-1.235,1.14v0.312h-1.583V22.69c0-1.271,1.02-2.411,2.699-2.411c1.691,0,2.854,0.864,2.854,2.519 - c0,2.003-2.339,3.55-3.586,4.894h3.454v1.367H21.717z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows2_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01V31.096z"/> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <text transform="matrix(1 0 0 1 21.2373 29.0586)" fill="#FFFFFF" font-family="'TradeGothicLTStd-Bold'" font-size="12">2</text> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4995" y1="29.1787" x2="24.4995" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M23.228,26.516c0,0.887,0.396,1.295,1.284,1.295c0.815,0,1.259-0.54,1.259-1.283 - c0-0.971-0.552-1.343-1.751-1.355v-1.367c1.116,0,1.547-0.312,1.547-1.116c0-0.6-0.396-1.043-1.115-1.043 - c-0.588,0-1.02,0.42-1.043,1.008h-1.583c0.012-1.595,1.187-2.375,2.638-2.375c1.559,0,2.687,0.816,2.687,2.351 - c0,0.755-0.36,1.535-1.043,1.883c0.924,0.36,1.248,1.115,1.248,2.087c0,1.715-1.259,2.579-2.818,2.579 - c-1.943,0-2.891-1.031-2.891-2.663H23.228z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4995" y1="29.1787" x2="24.4995" y2="20.2798"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M23.228,26.516c0,0.887,0.396,1.295,1.284,1.295c0.815,0,1.259-0.54,1.259-1.283 - c0-0.971-0.552-1.343-1.751-1.355v-1.367c1.116,0,1.547-0.312,1.547-1.116c0-0.6-0.396-1.043-1.115-1.043 - c-0.588,0-1.02,0.42-1.043,1.008h-1.583c0.012-1.595,1.187-2.375,2.638-2.375c1.559,0,2.687,0.816,2.687,2.351 - c0,0.755-0.36,1.535-1.043,1.883c0.924,0.36,1.248,1.115,1.248,2.087c0,1.715-1.259,2.579-2.818,2.579 - c-1.943,0-2.891-1.031-2.891-2.663H23.228z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows3_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01V31.096z"/> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <text transform="matrix(1 0 0 1 21.2373 29.0586)" fill="#FFFFFF" font-family="'TradeGothicLTStd-Bold'" font-size="12">3</text> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4995" y1="29.0586" x2="24.4995" y2="20.3999"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M24.907,20.399h1.643v5.157h1.211v1.223H26.55v2.279h-1.511V26.78h-3.802v-1.391L24.907,20.399z - M25.039,25.557v-3.382h-0.024l-2.458,3.382H25.039z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.4995" y1="29.0586" x2="24.4995" y2="20.3999"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M24.907,20.399h1.643v5.157h1.211v1.223H26.55v2.279h-1.511V26.78h-3.802v-1.391L24.907,20.399z - M25.039,25.557v-3.382h-0.024l-2.458,3.382H25.039z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows4_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01V31.096z"/> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <text transform="matrix(1 0 0 1 21.2373 29.0586)" fill="#FFFFFF" font-family="'TradeGothicLTStd-Bold'" font-size="12">4</text> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.5298" y1="29.1787" x2="24.5298" y2="20.3999"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M23.24,26.576c-0.036,0.803,0.456,1.235,1.235,1.235c1.031,0,1.343-0.671,1.343-1.883 - c0-1.067-0.36-1.667-1.259-1.667c-0.54,0-0.972,0.264-1.271,0.672h-1.307v-4.534h5.001v1.367h-3.634v1.799 - c0.456-0.324,0.936-0.527,1.571-0.527c1.847,0,2.482,1.151,2.482,2.926c0,2.003-0.828,3.214-2.902,3.214 - c-2.159,0-2.842-1.295-2.842-2.603H23.24z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01 - V31.096z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g opacity="0.3"> - <g> - <linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.5298" y1="29.1787" x2="24.5298" y2="20.3999"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_4_)" d="M23.24,26.576c-0.036,0.803,0.456,1.235,1.235,1.235c1.031,0,1.343-0.671,1.343-1.883 - c0-1.067-0.36-1.667-1.259-1.667c-0.54,0-0.972,0.264-1.271,0.672h-1.307v-4.534h5.001v1.367h-3.634v1.799 - c0.456-0.324,0.936-0.527,1.571-0.527c1.847,0,2.482,1.151,2.482,2.926c0,2.003-0.828,3.214-2.902,3.214 - c-2.159,0-2.842-1.295-2.842-2.603H23.24z"/> - </g> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows5_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M30.01,31.096H19.137V18.347H30.01V31.096z"/> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -<g> - <text transform="matrix(1 0 0 1 21.2373 29.0586)" fill="#FFFFFF" font-family="'TradeGothicLTStd-Bold'" font-size="12">5</text> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.5737" y1="33.4668" x2="24.5737" y2="15.9775"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127 - h11.496c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079 - V30.631z"/> -</g> -<g opacity="0.3"> - <linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.8291" y1="37.75" x2="29.8291" y2="20.9697"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_3_)" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127 - c0,0.977,0.795,1.771,1.772,1.771h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/windows_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.3276" y1="53.127" x2="27.3276" y2="0.873"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<path fill="url(#SVGID_1_)" d="M53.455,27.001c0,14.43-11.698,26.125-26.128,26.125S1.199,41.432,1.199,27.001 - c0-14.432,11.698-26.129,26.128-26.129S53.455,12.57,53.455,27.001z"/> -<g> - <path fill="#FFFFFF" d="M30.321,15.977H18.826c-1.173,0-2.126,0.953-2.126,2.126V31.34c0,1.172,0.954,2.127,2.126,2.127h11.496 - c1.173,0,2.126-0.955,2.126-2.127V18.103C32.447,16.93,31.494,15.977,30.321,15.977z M29.613,30.631H19.534V18.812h10.079V30.631z" - /> -</g> -<g> - <path fill="#FFFFFF" d="M35.578,20.969H33.76v2.126h1.463v12.528H24.436v-0.771H22.31v1.127c0,0.977,0.795,1.771,1.772,1.771 - h11.497c0.977,0,1.771-0.795,1.771-1.771V22.74C37.35,21.763,36.555,20.969,35.578,20.969z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4893" y1="53.6143" x2="26.4893" y2="1.3599"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="27.488" r="26.127"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="26.1948" y1="38.459" x2="26.1948" y2="15.563"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M34.37,33.149c1.416-1.845,2.27-4.146,2.27-6.646c0-6.034-4.907-10.94-10.938-10.94 - c-6.033,0-10.94,4.906-10.94,10.94c0,6.032,4.908,10.94,10.94,10.94c2.523,0,4.844-0.868,6.698-2.311l3.219,3.326l2.01-1.943 - L34.37,33.149z M31.087,28.068h-3.772v3.953h-3.228v-3.953h-3.771v-3.16h3.771v-3.925h3.228v3.925h3.772V28.068z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4893" y1="53.8057" x2="26.4893" y2="1.5513"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="27.68" r="26.127"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="26.1948" y1="38.6504" x2="26.1948" y2="15.7544"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M34.37,33.341c1.416-1.845,2.27-4.146,2.27-6.646c0-6.034-4.907-10.94-10.938-10.94 - c-6.033,0-10.94,4.906-10.94,10.94c0,6.032,4.908,10.94,10.94,10.94c2.523,0,4.844-0.868,6.698-2.311l3.219,3.326l2.01-1.943 - L34.37,33.341z M31.087,28.26h-3.772v3.953h-3.228V28.26h-3.771V25.1h3.771v-3.925h3.228V25.1h3.772V28.26z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom+_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4893" y1="53.5967" x2="26.4893" y2="1.3423"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="27.471" r="26.127"/> -<g> - <path fill="#FFFFFF" d="M34.37,33.132c1.416-1.845,2.27-4.146,2.27-6.646c0-6.034-4.907-10.94-10.938-10.94 - c-6.033,0-10.94,4.906-10.94,10.94c0,6.032,4.908,10.94,10.94,10.94c2.523,0,4.844-0.868,6.698-2.311l3.219,3.326l2.01-1.943 - L34.37,33.132z M31.087,28.051h-3.772v3.953h-3.228v-3.953h-3.771v-3.16h3.771v-3.925h3.228v3.925h3.772V28.051z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4897" y1="52.6143" x2="26.4897" y2="0.3599"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="26.488" r="26.127"/> -<g> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="26.4575" y1="37.7061" x2="26.4575" y2="14.7505"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M34.653,32.385c1.42-1.852,2.277-4.159,2.277-6.666c0-6.049-4.922-10.969-10.97-10.969 - s-10.968,4.92-10.968,10.969c0,6.047,4.92,10.97,10.968,10.97c2.532,0,4.858-0.872,6.716-2.315l3.229,3.333l2.016-1.949 - L34.653,32.385z M31.249,27.257H20.674v-3.103h10.575V27.257z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4897" y1="53.8057" x2="26.4897" y2="1.5513"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="27.68" r="26.127"/> -<g opacity="0.3"> - <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="26.4575" y1="38.8975" x2="26.4575" y2="15.9419"> - <stop offset="0" style="stop-color:#95A7C4"/> - <stop offset="0.5031" style="stop-color:#CAD6EB"/> - <stop offset="0.5337" style="stop-color:#D9E8FC"/> - <stop offset="1" style="stop-color:#FFFFFF"/> - </linearGradient> - <path fill="url(#SVGID_2_)" d="M34.653,33.576c1.42-1.852,2.277-4.159,2.277-6.666c0-6.049-4.922-10.969-10.97-10.969 - s-10.968,4.92-10.968,10.969c0,6.047,4.92,10.97,10.968,10.97c2.532,0,4.858-0.872,6.716-2.315l3.229,3.333l2.016-1.949 - L34.653,33.576z M31.249,28.448H20.674v-3.103h10.575V28.448z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/fjicons/zoom-_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="54px" height="54px" viewBox="0 0 54 54" enable-background="new 0 0 54 54" xml:space="preserve"> -<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.4897" y1="53.5967" x2="26.4897" y2="1.3423"> - <stop offset="0" style="stop-color:#303F57"/> - <stop offset="1" style="stop-color:#445B7C"/> -</linearGradient> -<circle fill="url(#SVGID_1_)" cx="26.489" cy="27.471" r="26.127"/> -<g> - <path fill="#FFFFFF" d="M34.653,33.367c1.42-1.852,2.277-4.159,2.277-6.666c0-6.049-4.922-10.969-10.97-10.969 - s-10.968,4.92-10.968,10.969c0,6.047,4.92,10.97,10.968,10.97c2.532,0,4.858-0.872,6.716-2.315l3.229,3.333l2.016-1.949 - L34.653,33.367z M31.249,28.239H20.674v-3.103h10.575V28.239z"/> -</g> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,473 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient7480" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient2860" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(92.426516,1.208512)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2872" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2874" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" /></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1594" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="37.75304" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="176" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><g - id="g2868" - transform="matrix(0.99999719,0,0,1,3.6432972e-5,0)"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#radialGradient2872);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - transform="matrix(0.99819699,-0.06002188,0.06002029,0.99822354,-4.4439963,-0.80630923)" /><path - style="fill:url(#linearGradient2874);fill-opacity:1;stroke:#20548b;stroke-width:0.64592773;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 40.913544,46.032369 0,-8.165907 8.165666,0 0,8.165907 8.165666,0 0,8.165905 -8.165666,0 0,8.165906 -8.165666,0 0,-8.165906 -8.165666,0 0,-8.165905 8.165666,0 z" - id="path2262" /></g></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,423 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow_disabled.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow_disabled.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1400" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="74.657802" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="176" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><g - id="g2857"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#radialGradient4052);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - transform="matrix(0.99819699,-0.06002188,0.06002029,0.99822354,-4.4440806,-0.80621808)" /><path - style="fill:#999999;stroke:#20548b;stroke-width:0.64592773999999997;stroke-linejoin:round;stroke-opacity:1;opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" - d="M 40.91346,46.032461 L 40.91346,37.866554 L 49.079126,37.866554 L 49.079126,46.032461 L 57.244792,46.032461 L 57.244792,54.198366 L 49.079126,54.198366 L 49.079126,62.364272 L 40.91346,62.364272 L 40.91346,54.198366 L 32.747794,54.198366 L 32.747794,46.032461 L 40.91346,46.032461 z" - id="path2262" /></g></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/addwindow_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,498 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="addwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(5.6049566,1.2086036)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient7480" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient2860" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(92.426516,1.208512)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2872" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2874" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(8.4342403e-5,-9.155726e-5)" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2864" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.99999719,0,0,1,1.2077514e-4,-9.155726e-5)" - x1="32.424831" - y1="50.115414" - x2="57.567757" - y2="50.115414" /><filter - id="filter2871" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2873" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2875" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="973" - inkscape:window-width="1594" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="37.75304" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="176" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><g - id="g2867" - style="filter:url(#filter2871)"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#radialGradient2872);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - transform="matrix(0.99819419,-0.06002188,0.06002012,0.99822354,-4.4439474,-0.80630923)" /><path - style="fill:url(#linearGradient2864);fill-opacity:1;stroke:#20548b;stroke-width:0.64592683;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 40.913465,46.032369 0,-8.165907 8.165644,0 0,8.165907 8.165643,0 0,8.165905 -8.165643,0 0,8.165906 -8.165644,0 0,-8.165906 -8.165643,0 0,-8.165905 8.165643,0 z" - id="path2262" /></g></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -</defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1318" - inkscape:window-height="973" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-83.474576" - inkscape:cy="50" - inkscape:window-x="66" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<g - id="g7" - i:extraneous="self" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)"> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop10" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop12" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop14" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop16" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop18" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop20" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop22" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop24" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop26" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - <circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="circle28" - r="31.795" - cy="53.796001" - cx="46.294998" /> - <g - transform="matrix(0,-1,-1,0,57.067,57.035017)" - id="g5938"> - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop34" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - <path - style="fill:url(#path4348_1_);stroke:#20548b;stroke-linejoin:round" - d="m -17.442,10.352 20.16,24.02 20.489,-24.02 H 14.883 V -6.351 H -9.084 v 16.703 h -8.358 z" - nodetypes="cccccccc" - id="path4348" /> - <path - style="opacity:0.4;fill:none;stroke:#20548b" - d="M -15.1,11.366 2.74,32.787 20.907,11.366 H 13.871 V -5.306 H -8.033 V 11.366 H -15.1 z" - nodetypes="cccccccc" - id="path4360" /> - </g> - </g> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,188 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - <filter - id="filter3619" - inkscape:label="Desaturate" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3621" - type="saturate" - values="0" /></filter></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1318" - inkscape:window-height="973" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-113.55932" - inkscape:cy="50" - inkscape:window-x="66" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle28" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" /><g - id="g5938" - transform="matrix(0,-1.4965697,-1.4965686,0,66.937508,55.302092)" - style="filter:url(#filter3619);opacity:0.3125"> - - <linearGradient - id="path4348_1_" - gradientUnits="userSpaceOnUse" - x1="-661.64758" - y1="735.20758" - x2="-700.45172" - y2="735.20758" - gradientTransform="translate(664.5293,-739.6309)"> - <stop - offset="0" - style="stop-color:#A7BCE1" - id="stop32" /> - <stop - offset="1" - style="stop-color:#5278B2" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#A7BCE1" /> - <a:midPointStop - offset="0.5" - style="stop-color:#A7BCE1" /> - <a:midPointStop - offset="1" - style="stop-color:#5278B2" /> - </linearGradient> - <path - id="path4348" - nodetypes="cccccccc" - d="m -17.442,10.352 20.16,24.02 20.489,-24.02 H 14.883 V -6.351 H -9.084 v 16.703 h -8.358 z" - style="fill:url(#path4348_1_);stroke:#20548b;stroke-linejoin:round" /> - <path - id="path4360" - nodetypes="cccccccc" - d="M -15.1,11.366 2.74,32.787 20.907,11.366 H 13.871 V -5.306 H -8.033 V 11.366 H -15.1 z" - style="opacity:0.40000000000000002;fill:none;stroke:#20548b" /> - </g> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/back_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<filter - id="filter2830" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2832" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2834" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1318" - inkscape:window-height="973" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-83.474576" - inkscape:cy="50" - inkscape:window-x="66" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<g - id="g7" - i:extraneous="self" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" - style="filter:url(#filter2830)"> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop10" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop12" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop14" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop16" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop18" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop20" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop22" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop24" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop26" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - <circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="circle28" - r="31.795" - cy="53.796001" - cx="46.294998" /> - <g - transform="matrix(0,-1,-1,0,57.067,57.035017)" - id="g5938"> - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop34" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - <path - style="fill:url(#path4348_1_);stroke:#20548b;stroke-linejoin:round" - d="m -17.442,10.352 20.16,24.02 20.489,-24.02 H 14.883 V -6.351 H -9.084 v 16.703 h -8.358 z" - nodetypes="cccccccc" - id="path4348" /> - <path - style="opacity:0.4;fill:none;stroke:#20548b" - d="M -15.1,11.366 2.74,32.787 20.907,11.366 H 13.871 V -5.306 H -8.033 V 11.366 H -15.1 z" - nodetypes="cccccccc" - id="path4360" /> - </g> - </g> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/btnBorder.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/btnBorder.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/btnBorder.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/btnBorder.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="1" - height="100" - viewBox="0 0 1 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="btnBorder.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - <linearGradient - gradientTransform="translate(664.5293,-739.6309)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop32" - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" /> - <stop - id="stop34" - style="stop-color:#000000;stop-opacity:1;" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient> - - - </defs><sodipodi:namedview - pagecolor="#7e7874" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.47058824" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="6.675088" - inkscape:cx="-2.6986122" - inkscape:cy="26.618097" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> - - -<path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3924" /><path - style="fill:#ffffff;fill-opacity:0;stroke:none" - d="M 50.650282,82.018919 13.461845,50.806671 50.650282,19.085056 l 0,12.887439 25.860052,0 0,37.106346 -25.860052,0 0,12.940078 z" - nodetypes="cccccccc" - id="path3916" - clip-path="none" /><rect - style="fill:#838383;fill-opacity:0.23529412;fill-rule:evenodd;stroke:none" - id="rect2828" - width="1" - height="100" - x="-3.8146973e-06" - y="0" /></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,457 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="delwindow.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\12212009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\addwindow.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2792" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2790" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4368" - x1="-21.2987" - y1="-3.6796536" - x2="18.7013" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4376" - x1="-21.478487" - y1="-3.6796536" - x2="18.881084" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4420" - x1="35.333408" - y1="50.115414" - x2="54.65918" - y2="50.115414" - gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1400" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="-26.099774" - inkscape:cy="58.252689" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><circle - transform="matrix(0.99819439,-0.06002187,0.06002013,0.99822334,-4.4439508,-0.80629186)" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient4052);stroke:#787878" - id="circle50074" - r="31.795" - cy="53.796001" - cx="46.294998" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><rect - style="opacity:1;fill:url(#linearGradient4420);fill-opacity:1.0;fill-rule:nonzero;stroke:#20548b;stroke-width:0.64592773999999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4378" - width="18.679844" - height="5.7616491" - x="35.656372" - y="47.234589" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/delwindow_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,449 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="delwindow_disabled.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\delwindow_disabled.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2792" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2790" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient4052" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4368" - x1="-21.2987" - y1="-3.6796536" - x2="18.7013" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /><linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient4376" - x1="-21.478487" - y1="-3.6796536" - x2="18.881084" - y2="-3.6796536" - gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1400" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="5.7184079" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:current-layer="g4046" - inkscape:window-maximized="0" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><circle - transform="matrix(0.99819439,-0.06002187,0.06002013,0.99822334,-4.4439508,-0.80629186)" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient4052);stroke:#787878" - id="circle50074" - r="31.795" - cy="53.796001" - cx="46.294998" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><rect - style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#20548b;stroke-width:0.64592773999999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4378" - width="18.679844" - height="5.7616491" - x="35.656372" - y="47.234589" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,480 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere.svg"><metadata - id="metadata105"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs103"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective107" /><radialGradient - inkscape:collect="always" - xlink:href="#path1720_2_" - id="radialGradient2929" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - cx="-2299.9971" - cy="-18798.3164" - r="19.7029" /><radialGradient - inkscape:collect="always" - xlink:href="#path1091_2_" - id="radialGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - cx="-1951.1113" - cy="-18398.6855" - fx="-1950.5051" - fy="-18398.6855" - r="26.0668" /><linearGradient - inkscape:collect="always" - xlink:href="#path1727_2_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)" - x1="-1934.1221" - y1="-18440.3535" - x2="-1929.3682" - y2="-18390.5215" /><linearGradient - inkscape:collect="always" - xlink:href="#path2345_2_" - id="linearGradient2935" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)" - x1="-12217.0928" - y1="-10465.0684" - x2="-12215.1611" - y2="-10465.0684" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="838" - inkscape:window-height="610" - id="namedview101" - showgrid="false" - inkscape:zoom="2.43" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="100" - inkscape:window-y="311" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.3986014,0,0,1.3986014,-19.58042,-20.27972)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="compass" - viewBox="-19.32 -19.32 38.639 38.639"> - - <radialGradient - id="path1720_2_" - cx="-2299.9971" - cy="-18798.316" - r="19.7029" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#45B3E6" - id="stop11" /> - <stop - offset="1" - style="stop-color:#184D9D" - id="stop13" /> - <a:midPointStop - offset="0" - style="stop-color:#45B3E6" /> - <a:midPointStop - offset="0.5" - style="stop-color:#45B3E6" /> - <a:midPointStop - offset="1" - style="stop-color:#184D9D" /> - </radialGradient> - <path - id="path1720_1_" - d="m 14.41,0.004 c 0.003,-7.955 -6.483,-14.408 -14.488,-14.411 -8.005,-0.004 -14.498,6.442 -14.501,14.399 0,0.004 0,0.008 0,0.012 -0.004,7.956 6.482,14.409 14.488,14.413 8.006,0.004 14.497,-6.443 14.501,-14.399 0,-0.004 0,-0.009 0,-0.014 z" - style="fill:url(#radialGradient2929);stroke:#010101" /> - - <radialGradient - id="path1091_2_" - cx="-1951.1113" - cy="-18398.686" - r="26.066799" - fx="-1950.5051" - fy="-18398.686" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop17" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop19" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </radialGradient> - <path - id="path1091_1_" - d="m 0,18.929 c -10.449,0 -18.928,-8.48 -18.928,-18.93 0,-10.448 8.479,-18.928 18.928,-18.928 10.449,0 18.929,8.479 18.929,18.928 0,10.449 -8.481,18.93 -18.929,18.93 z m 0,-4.563 c 7.93,0 14.366,-6.437 14.366,-14.367 0,-7.93 -6.436,-14.364 -14.366,-14.364 -7.93,0 -14.366,6.433 -14.366,14.364 0,7.931 6.435,14.367 14.366,14.367 z" - style="fill:url(#radialGradient2931);stroke:#010101;stroke-width:0.78200001;stroke-opacity:0.46520003" /> - - <linearGradient - id="path1727_2_" - gradientUnits="userSpaceOnUse" - x1="-1934.1221" - y1="-18440.354" - x2="-1929.3682" - y2="-18390.521" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop23" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop25" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path1727_1_" - d="m 0.001,17.614 c -9.798,0 -17.751,-7.92 -17.751,-17.678 0,-9.759 7.953,-17.677 17.751,-17.677 9.798,0 17.75,7.918 17.75,17.677 0,9.758 -7.952,17.678 -17.75,17.678 z m 0.071,-0.206 c 8.723,0 15.802,-7.813 15.802,-17.438 0,-9.624 -7.079,-17.436 -15.802,-17.436 -8.724,0 -15.803,7.812 -15.803,17.436 10e-4,9.626 7.08,17.438 15.803,17.438 z" - style="fill:url(#linearGradient2933)" /> - <g - id="g3211_1_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1058_1_" - d="m -85.396,-5.522 1.845,-1.818 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9593,-0.8517,-0.9223,0.8858,-85.4297,-4.0513)" - font-size="1.0011" - id="text30" - style="font-size:1.00109994px;fill:#ffffff;font-family:Arial-BoldMT">SE</text> - - </g> - <g - id="g1104_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1044_1_" - d="m 132.683,33.045 c 0.001,-1.12 -0.906,-2.029 -2.025,-2.031 -1.121,0 -2.029,0.905 -2.03,2.026 0,10e-4 0,0.002 0,0.005 -10e-4,1.119 0.905,2.027 2.025,2.029 1.12,0 2.029,-0.907 2.03,-2.026 0,-0.002 0,-0.003 0,-0.003 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.8877,32.3284)" - font-size="1.5393" - id="text34" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">S</text> - - </g> - <g - id="g3206_1_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1059_1_" - d="m -109.454,-7.362 1.775,1.887 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9415,0.866,0.9378,0.8694,-105.9589,-5.5599)" - font-size="1.0026" - id="text38" - style="font-size:1.00259995px;fill:#ffffff;font-family:Arial-BoldMT">SW</text> - - </g> - <path - id="path1118_1_" - d="m 0.044,10.149 -1.419,-6.792 -3.633,1.635 1.638,-3.643 -6.794,-1.368 6.792,-1.417 -1.635,-3.634 3.645,1.638 1.365,-6.794 1.418,6.789 3.633,-1.633 -1.639,3.644 6.796,1.365 L 3.42,1.359 5.053,4.992 1.41,3.353 0.044,10.149 z M -0.003,2.751 c 1.505,0 2.728,-1.222 2.728,-2.729 0,-1.506 -1.222,-2.729 -2.728,-2.729 -1.506,0 -2.73,1.223 -2.73,2.729 0,1.507 1.224,2.729 2.73,2.729 z" - style="fill:#74ccdd;fill-opacity:0.08699999;stroke:#ffffff;stroke-width:1.95500004;stroke-opacity:0.46089998" /> - <g - id="g1109_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1043_1_" - d="m 148.643,49.095 c 0.001,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.027 0,0 0,10e-4 0,0.002 -0.001,1.12 0.906,2.028 2.026,2.031 1.12,0 2.028,-0.908 2.029,-2.027 0,0 0,-0.003 0,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,145.8665,48.3771)" - font-size="1.5393" - id="text43" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">E</text> - - </g> - <g - id="g1099_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1042_1_" - d="m 116.45,49.171 c 10e-4,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.026 0,10e-4 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.026,2.029 1.12,10e-4 2.029,-0.905 2.03,-2.026 -10e-4,-10e-4 -10e-4,-0.002 -10e-4,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,113.0997,48.3646)" - font-size="1.7317" - id="text47" - style="font-size:1.73169994px;fill:#ffffff;font-family:Arial-BoldMT">W</text> - - </g> - <g - id="g1886_1_" - transform="matrix(0.781983,0,0,0.781983,433.1542,-41.87943)"> - <path - id="path1057_1_" - d="m -566.783,66.608 1.845,-1.817 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.8541,0.9296,1.0066,-0.7887,-564.9382,63.1555)" - font-size="1.0092" - id="text51" - style="font-size:1.00919998px;fill:#ffffff;font-family:Arial-BoldMT">NW</text> - - </g> - <g - id="g1891_1_" - transform="matrix(0.781983,0,0,0.781983,431.609,-41.97033)"> - <path - id="path1060_1_" - d="m -540.838,64.805 1.823,1.841 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.9427,-0.8651,-0.9368,-0.8705,-542.3826,64.5555)" - font-size="1.0024" - id="text55" - style="font-size:1.00240004px;fill:#ffffff;font-family:Arial-BoldMT">NE</text> - - </g> - <g - id="g1094_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1802_1_" - d="m 132.683,65.237 c 0.001,-1.119 -0.906,-2.029 -2.025,-2.029 -1.121,-10e-4 -2.029,0.905 -2.03,2.026 0,0.001 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.025,2.029 1.12,0.001 2.029,-0.907 2.03,-2.026 0,-0.001 0,-0.002 0,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72170003" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.7616,64.5194)" - font-size="1.5393" - id="text59" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">N</text> - - </g> - <g - id="g2458_1_" - transform="matrix(0.687849,0.371969,-0.371969,0.687849,616.8255,126.7079)"> - <g - id="g2337_1_" - transform="translate(0,-4.882812e-6)"> - <path - id="path2335_1_" - d="m -757.814,241.357 -13.129,-8.59 0.646,-0.987 12.483,9.577" - style="fill:#d32028;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - <path - id="path2336_1_" - d="m -757.814,241.357 -13.129,-8.59 -0.646,0.987 13.775,7.603" - style="fill:#f48620;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - </g> - <path - id="path2341_1_" - d="m -784.071,224.179 13.128,8.589 0.646,-0.987 -13.774,-7.602" - style="fill:#afafaf;stroke:#010101;stroke-width:0.49450001;stroke-opacity:0.45489999" /> - <path - id="path2342_1_" - d="m -784.071,224.179 13.128,8.589 -0.646,0.987 -12.482,-9.576" - style="fill:#706f70;stroke:#010101;stroke-width:0.1978;stroke-opacity:0.45489999" /> - - <linearGradient - id="path2345_2_" - gradientUnits="userSpaceOnUse" - x1="-12217.093" - y1="-10465.068" - x2="-12215.161" - y2="-10465.068" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)"> - <stop - offset="0" - style="stop-color:#010101" - id="stop68" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop70" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path2345_1_" - d="m -770.389,231.762 c -0.521,-0.34 -1.22,-0.195 -1.561,0.327 -0.341,0.521 -0.196,1.22 0.326,1.562 0.522,0.341 1.221,0.195 1.562,-0.326 0.34,-0.522 0.194,-1.221 -0.327,-1.563 z" - style="fill:url(#linearGradient2935);stroke:#010101" /> - <path - id="path2348_1_" - d="m -770.862,232.486 c -0.122,-0.08 -0.285,-0.046 -0.365,0.077 -0.08,0.121 -0.047,0.284 0.075,0.364 l 0,0 c 0.123,0.081 0.286,0.047 0.366,-0.076 0.081,-0.121 0.045,-0.285 -0.076,-0.365 l 0,0 z" - style="fill:#ffffff" /> - </g> - <path - id="path3202_1_" - d="m -9.463,9.623 -0.915,0.257 0.679,0.663 0.236,-0.92 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3203_1_" - d="M 10.441,9.786 9.522,9.545 9.773,10.462 10.441,9.786 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3204_1_" - d="m 10.464,-9.764 -0.667,-0.678 -0.252,0.918 0.919,-0.24 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3205_1_" - d="m -9.783,-10.432 -0.677,0.666 0.916,0.253 -0.239,-0.919 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="49.75" - cy="50.25" - r="35.25" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop79" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop81" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop83" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop85" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop87" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop89" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop91" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop93" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop95" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="49.75" - cy="50.25" - r="35.25" - id="circle97" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="49.75" - sodipodi:cy="50.25" - sodipodi:rx="35.25" - sodipodi:ry="35.25" - d="M 85,50.25 C 85,69.718037 69.218037,85.5 49.75,85.5 30.281963,85.5 14.5,69.718037 14.5,50.25 14.5,30.781963 30.281963,15 49.75,15 69.218037,15 85,30.781963 85,50.25 z" /> - - <use - xlink:href="#compass" - width="38.639" - height="38.639" - x="-19.32" - y="-19.32" - transform="matrix(1.69,0,0,-1.69,49.7705,50.3506)" - overflow="visible" - id="use99" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,479 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere_disabled.svg"><metadata - id="metadata104"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs102"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective106" /><radialGradient - inkscape:collect="always" - xlink:href="#path1720_1_" - id="radialGradient2920" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - cx="-2299.998" - cy="-18798.3164" - r="19.7027" /><radialGradient - inkscape:collect="always" - xlink:href="#path1091_1_" - id="radialGradient2922" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - cx="-1951.1113" - cy="-18398.6855" - fx="-1950.5051" - fy="-18398.6855" - r="26.0669" /><linearGradient - inkscape:collect="always" - xlink:href="#path1727_1_" - id="linearGradient2924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)" - x1="-1934.1221" - y1="-18440.3535" - x2="-1929.3682" - y2="-18390.5215" /><linearGradient - inkscape:collect="always" - xlink:href="#path2345_1_" - id="linearGradient2926" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)" - x1="-12217.0928" - y1="-10465.0684" - x2="-12215.1611" - y2="-10465.0684" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview100" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="209" - inkscape:window-y="370" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.3986014,0,0,1.3986014,-19.58042,-20.27972)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="compass" - viewBox="-19.32 -19.32 38.639 38.639"> - - <radialGradient - id="path1720_1_" - cx="-2299.998" - cy="-18798.316" - r="19.7027" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#939598" - id="stop11" /> - <stop - offset="1" - style="stop-color:#A3A5A8" - id="stop13" /> - <a:midPointStop - offset="0" - style="stop-color:#939598" /> - <a:midPointStop - offset="0.5" - style="stop-color:#939598" /> - <a:midPointStop - offset="1" - style="stop-color:#A3A5A8" /> - </radialGradient> - <path - id="path1720_2_" - d="m 14.409,0.004 c 0.004,-7.955 -6.482,-14.408 -14.487,-14.411 -8.005,-0.004 -14.498,6.442 -14.501,14.399 0,0.004 0,0.008 0,0.012 -0.004,7.956 6.482,14.409 14.488,14.413 8.006,0.004 14.497,-6.443 14.5,-14.399 0,-0.004 0,-0.009 0,-0.014 z" - style="fill:url(#radialGradient2920);stroke:#010101" /> - - <radialGradient - id="path1091_1_" - cx="-1951.1113" - cy="-18398.686" - r="26.0669" - fx="-1950.5051" - fy="-18398.686" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop17" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop19" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </radialGradient> - <path - id="path1091_2_" - d="m 0,18.929 c -10.449,0 -18.928,-8.48 -18.928,-18.93 0,-10.448 8.479,-18.928 18.928,-18.928 10.449,0 18.929,8.479 18.929,18.928 0,10.449 -8.481,18.93 -18.929,18.93 z m 0,-4.563 c 7.93,0 14.367,-6.437 14.367,-14.367 0,-7.93 -6.437,-14.364 -14.367,-14.364 -7.93,0 -14.366,6.433 -14.366,14.364 0,7.931 6.435,14.367 14.366,14.367 z" - style="fill:url(#radialGradient2922);stroke:#010101;stroke-width:0.78200001;stroke-opacity:0.46520003" /> - - <linearGradient - id="path1727_1_" - gradientUnits="userSpaceOnUse" - x1="-1934.1221" - y1="-18440.354" - x2="-1929.3682" - y2="-18390.521" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop23" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop25" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path1727_2_" - d="m 0.001,17.614 c -9.798,0 -17.751,-7.92 -17.751,-17.678 0,-9.759 7.953,-17.677 17.751,-17.677 9.799,0 17.75,7.918 17.75,17.677 0,9.758 -7.951,17.678 -17.75,17.678 z m 0.071,-0.206 c 8.724,0 15.802,-7.813 15.802,-17.438 0,-9.624 -7.078,-17.436 -15.802,-17.436 -8.724,0 -15.802,7.812 -15.802,17.436 0,9.626 7.079,17.438 15.802,17.438 z" - style="fill:url(#linearGradient2924)" /> - <g - id="g3211_2_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1058_2_" - d="m -85.396,-5.522 1.845,-1.818 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9593,-0.8517,-0.9223,0.8858,-85.4303,-4.0513)" - font-size="1.0011" - id="text30" - style="font-size:1.00109994px;fill:#ffffff;font-family:Arial-BoldMT">SE</text> - - </g> - <g - id="g1104_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1044_2_" - d="m 132.683,33.045 c 0,-1.12 -0.906,-2.029 -2.025,-2.031 -1.121,0 -2.029,0.905 -2.03,2.026 0,10e-4 0,0.002 0,0.005 -10e-4,1.119 0.905,2.027 2.025,2.029 1.12,0 2.029,-0.907 2.03,-2.026 0,-0.002 0,-0.003 0,-0.003 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.8871,32.3284)" - font-size="1.5393" - id="text34" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">S</text> - - </g> - <g - id="g3206_2_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1059_2_" - d="m -109.454,-7.362 1.775,1.887 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9415,0.866,0.9378,0.8694,-105.9596,-5.5599)" - font-size="1.0026" - id="text38" - style="font-size:1.00259995px;fill:#ffffff;font-family:Arial-BoldMT">SW</text> - - </g> - <path - id="path1118_2_" - d="m 0.044,10.149 -1.419,-6.792 -3.633,1.635 1.638,-3.643 -6.794,-1.368 6.792,-1.417 -1.635,-3.634 3.645,1.638 1.365,-6.794 1.418,6.789 3.634,-1.633 -1.64,3.644 6.797,1.365 L 3.42,1.359 5.053,4.992 1.41,3.353 0.044,10.149 z M -0.003,2.751 c 1.505,0 2.728,-1.222 2.728,-2.729 0,-1.506 -1.223,-2.729 -2.728,-2.729 -1.506,0 -2.73,1.223 -2.73,2.729 0,1.507 1.224,2.729 2.73,2.729 z" - style="fill:#74ccdd;fill-opacity:0.08699999;stroke:#ffffff;stroke-width:1.95500004;stroke-opacity:0.46089998" /> - <g - id="g1109_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1043_2_" - d="m 148.643,49.095 c 0.001,-1.119 -0.905,-2.028 -2.026,-2.029 -1.119,-0.001 -2.028,0.905 -2.029,2.027 0,0 0,10e-4 0,0.002 -0.001,1.12 0.905,2.028 2.027,2.031 1.119,0 2.028,-0.908 2.028,-2.027 0,0 0,-0.003 0,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,145.8658,48.3771)" - font-size="1.5393" - id="text43" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">E</text> - - </g> - <g - id="g1099_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1042_2_" - d="m 116.45,49.171 c 10e-4,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.026 0,10e-4 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.026,2.029 1.12,10e-4 2.029,-0.905 2.03,-2.026 -10e-4,-10e-4 -10e-4,-0.002 -10e-4,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,113.0991,48.3646)" - font-size="1.7317" - id="text47" - style="font-size:1.73169994px;fill:#ffffff;font-family:Arial-BoldMT">W</text> - - </g> - <g - id="g1886_2_" - transform="matrix(0.781983,0,0,0.781983,433.1542,-41.87943)"> - <path - id="path1057_2_" - d="m -566.783,66.608 1.845,-1.817 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.8541,0.9296,1.0066,-0.7887,-564.9388,63.1555)" - font-size="1.0092" - id="text51" - style="font-size:1.00919998px;fill:#ffffff;font-family:Arial-BoldMT">NW</text> - - </g> - <g - id="g1891_2_" - transform="matrix(0.781983,0,0,0.781983,431.609,-41.97033)"> - <path - id="path1060_2_" - d="m -540.838,64.805 1.822,1.841 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.9427,-0.8651,-0.9368,-0.8705,-542.3832,64.5555)" - font-size="1.0024" - id="text55" - style="font-size:1.00240004px;fill:#ffffff;font-family:Arial-BoldMT">NE</text> - - </g> - <g - id="g1094_2_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1802_2_" - d="m 132.683,65.237 c 0,-1.119 -0.906,-2.029 -2.025,-2.029 -1.121,-10e-4 -2.029,0.905 -2.03,2.026 0,0.001 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.025,2.029 1.12,0.001 2.029,-0.907 2.03,-2.026 0,-0.001 0,-0.002 0,-0.004 z" - style="fill:#878787;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72170003" /> - <text - transform="matrix(1.3848,0,0,-1.2788,129.761,64.5194)" - font-size="1.5393" - id="text59" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">N</text> - - </g> - <g - id="g2458_2_" - transform="matrix(0.687849,0.371969,-0.371969,0.687849,616.8255,126.7079)"> - <g - id="g2337_2_" - transform="translate(0,-4.882812e-6)"> - <path - id="path2335_2_" - d="m -757.814,241.357 -13.129,-8.59 0.646,-0.987 12.483,9.577" - style="fill:#828282;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - <path - id="path2336_2_" - d="m -757.814,241.357 -13.129,-8.59 -0.646,0.987 13.775,7.603" - style="fill:#8c8c8c;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - </g> - <path - id="path2341_2_" - d="m -784.071,224.179 13.128,8.589 0.646,-0.987 -13.774,-7.602" - style="fill:#afafaf;stroke:#010101;stroke-width:0.49450001;stroke-opacity:0.45489999" /> - <path - id="path2342_2_" - d="m -784.071,224.179 13.128,8.589 -0.646,0.987 -12.482,-9.576" - style="fill:#706f70;stroke:#010101;stroke-width:0.1978;stroke-opacity:0.45489999" /> - - <linearGradient - id="path2345_1_" - gradientUnits="userSpaceOnUse" - x1="-12217.093" - y1="-10465.068" - x2="-12215.161" - y2="-10465.068" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)"> - <stop - offset="0" - style="stop-color:#010101" - id="stop68" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop70" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path2345_2_" - d="m -770.389,231.762 c -0.521,-0.34 -1.22,-0.195 -1.561,0.327 -0.341,0.521 -0.196,1.22 0.326,1.562 0.522,0.341 1.221,0.195 1.562,-0.326 0.34,-0.522 0.194,-1.221 -0.327,-1.563 z" - style="fill:url(#linearGradient2926);stroke:#010101" /> - <path - id="path2348_2_" - d="m -770.862,232.486 c -0.122,-0.08 -0.285,-0.046 -0.365,0.077 -0.08,0.121 -0.047,0.284 0.075,0.364 l 0,0 c 0.123,0.081 0.286,0.047 0.366,-0.076 0.081,-0.121 0.045,-0.285 -0.076,-0.365 l 0,0 z" - style="fill:#ffffff" /> - </g> - <path - id="path3202_2_" - d="m -9.463,9.623 -0.915,0.257 0.679,0.663 0.236,-0.92 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3203_2_" - d="M 10.441,9.786 9.523,9.545 9.774,10.462 10.441,9.786 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3204_2_" - d="m 10.464,-9.764 -0.667,-0.678 -0.253,0.918 0.92,-0.24 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3205_2_" - d="m -9.783,-10.432 -0.677,0.666 0.916,0.253 -0.239,-0.919 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="49.75" - cy="50.25" - r="35.25" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop79" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop81" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop83" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop85" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop87" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop89" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop91" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop93" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop95" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="49.75" - cy="50.25" - r="35.25" - id="circle97" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="49.75" - sodipodi:cy="50.25" - sodipodi:rx="35.25" - sodipodi:ry="35.25" - d="M 85,50.25 C 85,69.718037 69.218037,85.5 49.75,85.5 30.281963,85.5 14.5,69.718037 14.5,50.25 14.5,30.781963 30.281963,15 49.75,15 69.218037,15 85,30.781963 85,50.25 z" /> - - <use - xlink:href="#compass" - width="38.639" - height="38.639" - id="XMLID_1_" - x="-19.32" - y="-19.32" - transform="matrix(1.69,0,0,-1.69,49.7705,50.3506)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/go-anywhere_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,505 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="go-anywhere.svg"><metadata - id="metadata105"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs103"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective107" /><radialGradient - inkscape:collect="always" - xlink:href="#path1720_2_" - id="radialGradient2929" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - cx="-2299.9971" - cy="-18798.3164" - r="19.7029" /><radialGradient - inkscape:collect="always" - xlink:href="#path1091_2_" - id="radialGradient2931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - cx="-1951.1113" - cy="-18398.6855" - fx="-1950.5051" - fy="-18398.6855" - r="26.0668" /><linearGradient - inkscape:collect="always" - xlink:href="#path1727_2_" - id="linearGradient2933" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)" - x1="-1934.1221" - y1="-18440.3535" - x2="-1929.3682" - y2="-18390.5215" /><linearGradient - inkscape:collect="always" - xlink:href="#path2345_2_" - id="linearGradient2935" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)" - x1="-12217.0928" - y1="-10465.0684" - x2="-12215.1611" - y2="-10465.0684" /><filter - id="filter2883" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2885" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2887" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1155" - inkscape:window-height="821" - id="namedview101" - showgrid="false" - inkscape:zoom="2.43" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="277" - inkscape:window-y="241" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.3986014,0,0,1.3986014,-19.58042,-20.27972)" - style="filter:url(#filter2883)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="compass" - viewBox="-19.32 -19.32 38.639 38.639"> - - <radialGradient - id="path1720_2_" - cx="-2299.9971" - cy="-18798.316" - r="19.7029" - gradientTransform="matrix(0.7372,0,0,-0.7327,1695.4731,-13773.522)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#45B3E6" - id="stop11" /> - <stop - offset="1" - style="stop-color:#184D9D" - id="stop13" /> - <a:midPointStop - offset="0" - style="stop-color:#45B3E6" /> - <a:midPointStop - offset="0.5" - style="stop-color:#45B3E6" /> - <a:midPointStop - offset="1" - style="stop-color:#184D9D" /> - </radialGradient> - <path - id="path1720_1_" - d="m 14.41,0.004 c 0.003,-7.955 -6.483,-14.408 -14.488,-14.411 -8.005,-0.004 -14.498,6.442 -14.501,14.399 0,0.004 0,0.008 0,0.012 -0.004,7.956 6.482,14.409 14.488,14.413 8.006,0.004 14.497,-6.443 14.501,-14.399 0,-0.004 0,-0.009 0,-0.014 z" - style="fill:url(#radialGradient2929);stroke:#010101" /> - - <radialGradient - id="path1091_2_" - cx="-1951.1113" - cy="-18398.686" - r="26.066799" - fx="-1950.5051" - fy="-18398.686" - gradientTransform="matrix(0.782,0,0,-0.782,1526.9541,-14388.01)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop17" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop19" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </radialGradient> - <path - id="path1091_1_" - d="m 0,18.929 c -10.449,0 -18.928,-8.48 -18.928,-18.93 0,-10.448 8.479,-18.928 18.928,-18.928 10.449,0 18.929,8.479 18.929,18.928 0,10.449 -8.481,18.93 -18.929,18.93 z m 0,-4.563 c 7.93,0 14.366,-6.437 14.366,-14.367 0,-7.93 -6.436,-14.364 -14.366,-14.364 -7.93,0 -14.366,6.433 -14.366,14.364 0,7.931 6.435,14.367 14.366,14.367 z" - style="fill:url(#radialGradient2931);stroke:#010101;stroke-width:0.78200001;stroke-opacity:0.46520003" /> - - <linearGradient - id="path1727_2_" - gradientUnits="userSpaceOnUse" - x1="-1934.1221" - y1="-18440.354" - x2="-1929.3682" - y2="-18390.521" - gradientTransform="matrix(0.7836,0,0,-0.7804,1513.9834,-14374.263)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop23" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop25" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path1727_1_" - d="m 0.001,17.614 c -9.798,0 -17.751,-7.92 -17.751,-17.678 0,-9.759 7.953,-17.677 17.751,-17.677 9.798,0 17.75,7.918 17.75,17.677 0,9.758 -7.952,17.678 -17.75,17.678 z m 0.071,-0.206 c 8.723,0 15.802,-7.813 15.802,-17.438 0,-9.624 -7.079,-17.436 -15.802,-17.436 -8.724,0 -15.803,7.812 -15.803,17.436 10e-4,9.626 7.08,17.438 15.803,17.438 z" - style="fill:url(#linearGradient2933)" /> - <g - id="g3211_1_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1058_1_" - d="m -85.396,-5.522 1.845,-1.818 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9593,-0.8517,-0.9223,0.8858,-85.4297,-4.0513)" - font-size="1.0011" - id="text30" - style="font-size:1.00109994px;fill:#ffffff;font-family:Arial-BoldMT">SE</text> - - - </g> - <g - id="g1104_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1044_1_" - d="m 132.683,33.045 c 0.001,-1.12 -0.906,-2.029 -2.025,-2.031 -1.121,0 -2.029,0.905 -2.03,2.026 0,10e-4 0,0.002 0,0.005 -10e-4,1.119 0.905,2.027 2.025,2.029 1.12,0 2.029,-0.907 2.03,-2.026 0,-0.002 0,-0.003 0,-0.003 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.8877,32.3284)" - font-size="1.5393" - id="text34" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">S</text> - - - </g> - <g - id="g3206_1_" - transform="matrix(0.781983,0,0,0.781983,75.47378,-4.3722)"> - <path - id="path1059_1_" - d="m -109.454,-7.362 1.775,1.887 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(-0.9415,0.866,0.9378,0.8694,-105.9589,-5.5599)" - font-size="1.0026" - id="text38" - style="font-size:1.00259995px;fill:#ffffff;font-family:Arial-BoldMT">SW</text> - - - </g> - <path - id="path1118_1_" - d="m 0.044,10.149 -1.419,-6.792 -3.633,1.635 1.638,-3.643 -6.794,-1.368 6.792,-1.417 -1.635,-3.634 3.645,1.638 1.365,-6.794 1.418,6.789 3.633,-1.633 -1.639,3.644 6.796,1.365 L 3.42,1.359 5.053,4.992 1.41,3.353 0.044,10.149 z M -0.003,2.751 c 1.505,0 2.728,-1.222 2.728,-2.729 0,-1.506 -1.222,-2.729 -2.728,-2.729 -1.506,0 -2.73,1.223 -2.73,2.729 0,1.507 1.224,2.729 2.73,2.729 z" - style="fill:#74ccdd;fill-opacity:0.08699999;stroke:#ffffff;stroke-width:1.95500004;stroke-opacity:0.46089998" /> - <g - id="g1109_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1043_1_" - d="m 148.643,49.095 c 0.001,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.027 0,0 0,10e-4 0,0.002 -0.001,1.12 0.906,2.028 2.026,2.031 1.12,0 2.028,-0.908 2.029,-2.027 0,0 0,-0.003 0,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,145.8665,48.3771)" - font-size="1.5393" - id="text43" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">E</text> - - - </g> - <g - id="g1099_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1042_1_" - d="m 116.45,49.171 c 10e-4,-1.119 -0.906,-2.028 -2.026,-2.029 -1.12,-0.001 -2.028,0.905 -2.029,2.026 0,10e-4 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.026,2.029 1.12,10e-4 2.029,-0.905 2.03,-2.026 -10e-4,-10e-4 -10e-4,-0.002 -10e-4,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72159998" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,113.0997,48.3646)" - font-size="1.7317" - id="text47" - style="font-size:1.73169994px;fill:#ffffff;font-family:Arial-BoldMT">W</text> - - - </g> - <g - id="g1886_1_" - transform="matrix(0.781983,0,0,0.781983,433.1542,-41.87943)"> - <path - id="path1057_1_" - d="m -566.783,66.608 1.845,-1.817 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.8541,0.9296,1.0066,-0.7887,-564.9382,63.1555)" - font-size="1.0092" - id="text51" - style="font-size:1.00919998px;fill:#ffffff;font-family:Arial-BoldMT">NW</text> - - - </g> - <g - id="g1891_1_" - transform="matrix(0.781983,0,0,0.781983,431.609,-41.97033)"> - <path - id="path1060_1_" - d="m -540.838,64.805 1.823,1.841 0,0 0,0" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.96100003" /> - - <text - transform="matrix(0.9427,-0.8651,-0.9368,-0.8705,-542.3826,64.5555)" - font-size="1.0024" - id="text55" - style="font-size:1.00240004px;fill:#ffffff;font-family:Arial-BoldMT">NE</text> - - - </g> - <g - id="g1094_1_" - transform="matrix(0.781983,0,0,0.781983,-102.0889,-38.43913)"> - <path - id="path1802_1_" - d="m 132.683,65.237 c 0.001,-1.119 -0.906,-2.029 -2.025,-2.029 -1.121,-10e-4 -2.029,0.905 -2.03,2.026 0,0.001 0,0.002 0,0.004 -10e-4,1.12 0.905,2.028 2.025,2.029 1.12,0.001 2.029,-0.907 2.03,-2.026 0,-0.001 0,-0.002 0,-0.004 z" - style="fill:#417abe;stroke:#ffffff;stroke-width:1.125;stroke-opacity:0.72170003" /> - - <text - transform="matrix(1.3848,0,0,-1.2788,129.7616,64.5194)" - font-size="1.5393" - id="text59" - style="font-size:1.53929996px;fill:#ffffff;font-family:Arial-BoldMT">N</text> - - - </g> - <g - id="g2458_1_" - transform="matrix(0.687849,0.371969,-0.371969,0.687849,616.8255,126.7079)"> - <g - id="g2337_1_" - transform="translate(0,-4.882812e-6)"> - <path - id="path2335_1_" - d="m -757.814,241.357 -13.129,-8.59 0.646,-0.987 12.483,9.577" - style="fill:#d32028;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - <path - id="path2336_1_" - d="m -757.814,241.357 -13.129,-8.59 -0.646,0.987 13.775,7.603" - style="fill:#f48620;stroke:#010101;stroke-width:0.5;stroke-opacity:0.4565" /> - </g> - <path - id="path2341_1_" - d="m -784.071,224.179 13.128,8.589 0.646,-0.987 -13.774,-7.602" - style="fill:#afafaf;stroke:#010101;stroke-width:0.49450001;stroke-opacity:0.45489999" /> - <path - id="path2342_1_" - d="m -784.071,224.179 13.128,8.589 -0.646,0.987 -12.482,-9.576" - style="fill:#706f70;stroke:#010101;stroke-width:0.1978;stroke-opacity:0.45489999" /> - - <linearGradient - id="path2345_2_" - gradientUnits="userSpaceOnUse" - x1="-12217.093" - y1="-10465.068" - x2="-12215.161" - y2="-10465.068" - gradientTransform="matrix(0.0797,-0.9515,-0.9515,-0.0797,-9755.1816,-12225.4)"> - <stop - offset="0" - style="stop-color:#010101" - id="stop68" /> - <stop - offset="1" - style="stop-color:#FFFFFF" - id="stop70" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF" /> - </linearGradient> - <path - id="path2345_1_" - d="m -770.389,231.762 c -0.521,-0.34 -1.22,-0.195 -1.561,0.327 -0.341,0.521 -0.196,1.22 0.326,1.562 0.522,0.341 1.221,0.195 1.562,-0.326 0.34,-0.522 0.194,-1.221 -0.327,-1.563 z" - style="fill:url(#linearGradient2935);stroke:#010101" /> - <path - id="path2348_1_" - d="m -770.862,232.486 c -0.122,-0.08 -0.285,-0.046 -0.365,0.077 -0.08,0.121 -0.047,0.284 0.075,0.364 l 0,0 c 0.123,0.081 0.286,0.047 0.366,-0.076 0.081,-0.121 0.045,-0.285 -0.076,-0.365 l 0,0 z" - style="fill:#ffffff" /> - </g> - <path - id="path3202_1_" - d="m -9.463,9.623 -0.915,0.257 0.679,0.663 0.236,-0.92 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3203_1_" - d="M 10.441,9.786 9.522,9.545 9.773,10.462 10.441,9.786 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3204_1_" - d="m 10.464,-9.764 -0.667,-0.678 -0.252,0.918 0.919,-0.24 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - <path - id="path3205_1_" - d="m -9.783,-10.432 -0.677,0.666 0.916,0.253 -0.239,-0.919 z" - style="fill:#ffffff;stroke:#ffffff;stroke-width:0.91070002" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="49.75" - cy="50.25" - r="35.25" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop79" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop81" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop83" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop85" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop87" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop89" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop91" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop93" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop95" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="49.75" - cy="50.25" - r="35.25" - id="circle97" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="49.75" - sodipodi:cy="50.25" - sodipodi:rx="35.25" - sodipodi:ry="35.25" - d="M 85,50.25 C 85,69.718037 69.218037,85.5 49.75,85.5 30.281963,85.5 14.5,69.718037 14.5,50.25 14.5,30.781963 30.281963,15 49.75,15 69.218037,15 85,30.781963 85,50.25 z" /> - - <use - xlink:href="#compass" - width="38.639" - height="38.639" - x="-19.32" - y="-19.32" - transform="matrix(1.69,0,0,-1.69,49.7705,50.3506)" - overflow="visible" - id="use99" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,210 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="menu.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - <linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2847" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(664.5293,-739.6309)" - x1="-661.64758" - y1="735.20758" - x2="-700.45172" - y2="735.20758" /><inkscape:perspective - id="perspective3639" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3667" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1318" - inkscape:window-height="973" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-75.302663" - inkscape:cy="50" - inkscape:window-x="66" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle28" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" /> - -<rect - style="opacity:0.98999999;fill:#000000;fill-opacity:0;stroke:#20548b;stroke-width:2.30222583;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect2849" - width="42.918114" - height="48.426586" - x="29.388401" - y="26.846029" /><g - id="g3627" - transform="translate(-1.7372893,-1.6949153)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g - id="g3627-1" - transform="translate(-1.7372893,10.593219)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g - id="g3627-1-9" - transform="translate(-1.7372893,22.881355)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623-7-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625-7-6" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/menu_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,293 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="menu.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - <linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2847" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(664.5293,-739.6309)" - x1="-661.64758" - y1="735.20758" - x2="-700.45172" - y2="735.20758" /><inkscape:perspective - id="perspective3639" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><inkscape:perspective - id="perspective3667" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /><filter - id="filter2836" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2838" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2840" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2842" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2844" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2846" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2848" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2850" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2852" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2854" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2856" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2858" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2860" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2862" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2864" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1318" - inkscape:window-height="973" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="-75.302663" - inkscape:cy="50" - inkscape:window-x="66" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle28" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950005999999989;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2836)" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" /> - -<rect - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:0;stroke:#20548b;stroke-width:2.30222582999999981;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2842)" - id="rect2849" - width="42.918114" - height="48.426586" - x="29.388401" - y="26.846029" /><g - id="g3627" - transform="translate(-1.7372893,-1.6949153)" - style="filter:url(#filter2848)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g - id="g3627-1" - transform="translate(-1.7372893,10.593219)" - style="filter:url(#filter2854)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g - id="g3627-1-9" - transform="translate(-1.7372893,22.881355)" - style="filter:url(#filter2860)"><path - d="m 41.949153,39.830509 c 0,1.404114 -1.327969,2.542373 -2.966102,2.542373 -1.638132,0 -2.966101,-1.138259 -2.966101,-2.542373 0,-1.404114 1.327969,-2.542373 2.966101,-2.542373 1.638133,0 2.966102,1.138259 2.966102,2.542373 z" - sodipodi:ry="2.5423729" - sodipodi:rx="2.9661016" - sodipodi:cy="39.830509" - sodipodi:cx="38.983051" - id="path3623-7-7" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /><rect - y="38.899593" - x="46.102982" - height="2.2855632" - width="21.77709" - id="rect3625-7-6" - style="opacity:0.98999999;fill:#22558c;fill-opacity:1;stroke:#20548b;stroke-width:1.83308065;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,154 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="mostVisited.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - <linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2847" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(664.5293,-739.6309)" - x1="-661.64758" - y1="735.20758" - x2="-700.45172" - y2="735.20758" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="15.273401" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle28" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" /> - -<text - xml:space="preserve" - style="font-size:40px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#25588e;fill-opacity:0.99008227;stroke:none;font-family:URW Chancery L;-inkscape-font-specification:URW Chancery L Bold Italic" - x="19.491526" - y="62.711861" - id="text2849"><tspan - sodipodi:role="line" - id="tspan2851" - x="19.491526" - y="62.711861">MV</tspan></text> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/mostVisited_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="mostVisited.svg"><metadata - id="metadata42"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs40"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective44" /> - <foreignObject - id="foreignObject5" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop10" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop12" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop14" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop16" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop18" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop20" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop24" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop26" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - <linearGradient - inkscape:collect="always" - xlink:href="#path4348_1_" - id="linearGradient2847" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(664.5293,-739.6309)" - x1="-661.64758" - y1="735.20758" - x2="-700.45172" - y2="735.20758" /><filter - id="filter2853" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2855" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2857" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter><filter - id="filter2859" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2861" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2863" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1018" - inkscape:window-height="692" - id="namedview38" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="15.273401" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle28" - style="fill:url(#SVGID_1_);stroke:#000000;stroke-width:3.22950005999999989;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter2853)" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - transform="matrix(1.4965686,0,0,1.4965697,-18.467172,-30.054786)" /> - -<text - xml:space="preserve" - style="font-size:40px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#25588e;fill-opacity:0.99008227000000004;stroke:none;font-family:URW Chancery L;-inkscape-font-specification:URW Chancery L Bold Italic;filter:url(#filter2859)" - x="19.491526" - y="62.711861" - id="text2849"><tspan - sodipodi:role="line" - id="tspan2851" - x="19.491526" - y="62.711861">MV</tspan></text> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/svg_toolbar_convert.sh --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/svg_toolbar_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=40 -ICON_HEIGHT=40 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular" /> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1061 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">1</text> -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows1_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1078 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows1_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g2669" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">1</text> -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1063 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows2.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4" - inkscape:cx="64.589364" - inkscape:cy="55.038405" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><g - id="g2947"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient3122);stroke:#787878" - id="circle2811" - r="31.795" - cy="53.796001" - cx="46.294998" - transform="translate(9.5229906e-6,-1.288025e-5)" /><use - style="overflow:visible;filter:url(#filter2945)" - overflow="visible" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - y="-10.473" - x="-10.363" - id="WIND_GRAPHIC" - height="20.945" - width="20.726999" - xlink:href="#switchwindows_x5F_icon" - inkscape:label="#XMLID_1_" /><text - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">2</text> -</g> -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows2_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1079 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows2_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">2</text> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows3.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">3</text> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows3_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1079 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows3_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">3</text> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1062 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows4.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">4</text> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows4_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1079 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows4_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /><text - transform="scale(1.0000172,0.99998281)" - y="69.704063" - x="43.617699" - font-size="25.4476" - id="text2814" - style="font-size:21.9605999px;fill:#010101;font-family:MyriadPro-Regular">4</text> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1083 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows5.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="Greyness"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " - result="fbSourceGraphic" /><feColorMatrix - result="fbSourceGraphicAlpha" - in="fbSourceGraphic" - values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" - id="feColorMatrix2951" /><feColorMatrix - id="feColorMatrix2953" - values="0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 " - in="fbSourceGraphic" /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter2947" - inkscape:label="Greyness"><feColorMatrix - id="feColorMatrix2949" - values="0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 " /></filter><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2960" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><g - id="g2965"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient2960);stroke:#787878" - id="circle2811" - r="31.795" - cy="53.796001" - cx="46.294998" - transform="translate(9.5229906e-6,-1.288025e-5)" /><use - style="overflow:visible;filter:url(#filter2945)" - overflow="visible" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - y="-10.473" - x="-10.363" - id="WIND_GRAPHIC" - height="20.945" - width="20.726999" - xlink:href="#switchwindows_x5F_icon" - inkscape:label="#XMLID_1_" /><text - style="font-size:21.96059989999999829px;fill:#999999;filter:url(#filter2947);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">5</text> -</g> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows5_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows5.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="Greyness"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " - result="fbSourceGraphic" /><feColorMatrix - result="fbSourceGraphicAlpha" - in="fbSourceGraphic" - values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" - id="feColorMatrix2951" /><feColorMatrix - id="feColorMatrix2953" - values="0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 " - in="fbSourceGraphic" /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter2947" - inkscape:label="Greyness"><feColorMatrix - id="feColorMatrix2949" - values="0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 0 0 0 0 0.5 0 " /></filter><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient2960" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter2970" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2972" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2974" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127"><g - id="g2965" - style="filter:url(#filter2970)"><circle - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" - sodipodi:ry="31.795" - sodipodi:rx="31.795" - sodipodi:cy="53.796001" - sodipodi:cx="46.294998" - style="fill:url(#radialGradient2960);stroke:#787878" - id="circle2811" - r="31.795" - cy="53.796001" - cx="46.294998" - transform="translate(9.5229906e-6,-1.288025e-5)" /><use - style="overflow:visible;filter:url(#filter2945)" - overflow="visible" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - y="-10.473" - x="-10.363" - id="WIND_GRAPHIC" - height="20.945" - width="20.726999" - xlink:href="#switchwindows_x5F_icon" - inkscape:label="#XMLID_1_" /><text - style="font-size:21.96059989999999829px;fill:#999999;filter:url(#filter2947);font-family:MyriadPro-Regular" - id="text2814" - font-size="25.4476" - x="43.617699" - y="69.704063" - transform="scale(1.0000172,0.99998281)">5</text> -</g> - -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,638 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows_disabled.svg"><metadata - id="metadata118"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs116"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective120" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2946" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2948" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2950" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2952" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2954" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2960" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2962" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2964" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview114" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="switchwindows_x5F_icon" - viewBox="-10.363 -10.473 20.727 20.945"> - <g - id="layer1_4_"> - <g - id="g5526_6_"> - <g - id="g5022_6_" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - style="opacity:0.58730002"> - - <linearGradient - id="rect4173_1_" - gradientUnits="userSpaceOnUse" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop14" /> - <stop - offset="0.5" - style="stop-color:#010101" - id="stop16" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop18" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </linearGradient> - <polygon - id="rect4173_5_" - points="-1834.583,-3497.024 -2343.865,-3497.024 -2343.865,-3315.15 -1834.583,-3315.15 " - style="opacity:0.40209997;fill:url(#linearGradient2946)" /> - - <radialGradient - id="path5058_1_" - cx="-5692351" - cy="-25844636" - r="44.5518" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop22" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop24" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5058_6_" - d="m -1834.583,-3315.15 v -181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - style="opacity:0.40209997;fill:url(#radialGradient2948)" /> - - <radialGradient - id="path5018_1_" - cx="6469965.5" - cy="-25844636" - r="44.560299" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop28" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop30" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5018_6_" - d="m -2343.865,-3315.15 v -181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - style="opacity:0.40209997;fill:url(#radialGradient2950)" /> - </g> - - <linearGradient - id="rect1887_1_" - gradientUnits="userSpaceOnUse" - x1="1661.9604" - y1="-15099.52" - x2="1661.9277" - y2="-15087.603" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)"> - <stop - offset="0" - style="stop-color:#C4C6C8" - id="stop34" /> - <stop - offset="0.1322" - style="stop-color:#DADCDD" - id="stop36" /> - <stop - offset="1" - style="stop-color:#8C8C8C" - id="stop38" /> - <a:midPointStop - offset="0" - style="stop-color:#C4C6C8" /> - <a:midPointStop - offset="0.5" - style="stop-color:#C4C6C8" /> - <a:midPointStop - offset="0.1322" - style="stop-color:#DADCDD" /> - <a:midPointStop - offset="0.5" - style="stop-color:#DADCDD" /> - <a:midPointStop - offset="1" - style="stop-color:#8C8C8C" /> - </linearGradient> - <path - id="rect1887_5_" - d="M -9.033,9.972 H 5.033 c 0.421,0 0.761,-0.341 0.761,-0.76 V -2.953 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 H -9.033 c -0.419,0 -0.76,0.341 -0.76,0.761 V 9.212 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - style="fill:url(#linearGradient2952);stroke:#c9c9c9;stroke-width:1.00010002" /> - <path - id="rect2779_5_" - d="M -9.033,9.592 H 5.033 c 0.211,0 0.381,-0.17 0.381,-0.38 V -2.953 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 H -9.033 c -0.209,0 -0.38,0.171 -0.38,0.381 V 9.212 c 0,0.21 0.171,0.38 0.38,0.38 z" - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" /> - - <linearGradient - id="rect6287_1_" - gradientUnits="userSpaceOnUse" - x1="115.6006" - y1="-16289.222" - x2="115.6006" - y2="-16278.958" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - id="stop43" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" /> - </linearGradient> - <path - id="rect6287_5_" - d="M -8.842,7.12 H 4.843 c 0.21,0 0.38,-0.17 0.38,-0.38 v -9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 H -8.842 c -0.21,0 -0.38,0.171 -0.38,0.381 V 6.74 c 0,0.21 0.17,0.38 0.38,0.38 z" - style="fill:url(#linearGradient2954)" /> - <path - id="path6289_5_" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6291_5_" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6293_5_" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - </g> - </g> - <g - id="layer1_3_"> - <g - id="g5526_5_"> - <g - id="g5022_3_" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - style="opacity:0.58730002"> - - <linearGradient - id="rect4173_2_" - gradientUnits="userSpaceOnUse" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)"> - <stop - offset="0" - style="stop-color:#010101;stop-opacity:0" - id="stop55" /> - <stop - offset="0.5" - style="stop-color:#010101" - id="stop57" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop59" /> - <a:midPointStop - offset="0" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </linearGradient> - <polygon - id="rect4173_3_" - points="-1649.997,-3975.441 -2159.278,-3975.441 -2159.278,-3793.567 -1649.997,-3793.567 " - style="opacity:0.40209997;fill:url(#linearGradient2956)" /> - - <radialGradient - id="path5058_2_" - cx="-5689279.5" - cy="-25825270" - r="44.555599" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop63" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop65" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5058_3_" - d="m -1649.997,-3793.567 v -181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - style="opacity:0.40209997;fill:url(#radialGradient2958)" /> - - <radialGradient - id="path5018_2_" - cx="6466894" - cy="-25825270" - r="44.560299" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#010101" - id="stop69" /> - <stop - offset="1" - style="stop-color:#010101;stop-opacity:0" - id="stop71" /> - <a:midPointStop - offset="0" - style="stop-color:#010101" /> - <a:midPointStop - offset="0.5" - style="stop-color:#010101" /> - <a:midPointStop - offset="1" - style="stop-color:#010101;stop-opacity:0" /> - </radialGradient> - <path - id="path5018_3_" - d="m -2159.278,-3793.567 v -181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - style="opacity:0.40209997;fill:url(#radialGradient2960)" /> - </g> - - <linearGradient - id="rect1887_2_" - gradientUnits="userSpaceOnUse" - x1="1665.1802" - y1="-15094.438" - x2="1665.1475" - y2="-15082.521" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)"> - <stop - offset="0" - style="stop-color:#BEC0C2" - id="stop75" /> - <stop - offset="0.1322" - style="stop-color:#CBCCCE" - id="stop77" /> - <stop - offset="1" - style="stop-color:#8C8C8C" - id="stop79" /> - <a:midPointStop - offset="0" - style="stop-color:#BEC0C2" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2" /> - <a:midPointStop - offset="0.1322" - style="stop-color:#CBCCCE" /> - <a:midPointStop - offset="0.5" - style="stop-color:#CBCCCE" /> - <a:midPointStop - offset="1" - style="stop-color:#8C8C8C" /> - </linearGradient> - <path - id="rect1887_3_" - d="M -5.033,3.971 H 9.033 c 0.421,0 0.761,-0.341 0.761,-0.76 V -8.954 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 H -5.033 c -0.419,0 -0.76,0.341 -0.76,0.761 V 3.211 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - style="fill:url(#linearGradient2962);stroke:#c9c9c9;stroke-width:1.00010002" /> - <path - id="rect2779_3_" - d="M -5.033,3.591 H 9.033 c 0.211,0 0.381,-0.17 0.381,-0.38 V -8.954 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 H -5.033 c -0.209,0 -0.38,0.171 -0.38,0.381 V 3.211 c 0,0.21 0.171,0.38 0.38,0.38 z" - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" /> - - <linearGradient - id="rect6287_2_" - gradientUnits="userSpaceOnUse" - x1="119.6006" - y1="-16283.223" - x2="119.6006" - y2="-16272.959" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - id="stop84" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - id="stop86" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0.9412" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0.7059" /> - </linearGradient> - <path - id="rect6287_3_" - d="M -4.842,1.119 H 8.843 c 0.21,0 0.38,-0.17 0.38,-0.38 v -9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 H -4.842 c -0.21,0 -0.38,0.171 -0.38,0.381 v 9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - style="fill:url(#linearGradient2964)" /> - <path - id="path6289_3_" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6291_3_" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - <path - id="path6293_3_" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - style="fill:#969696" /> - </g> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop93" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop95" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop97" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop99" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop101" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop103" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop105" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop107" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop109" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle111" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="XMLID_1_" - x="-10.363" - y="-10.473" - transform="matrix(2.1206,0,0,-2.1206,45.4453,56.0293)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/windows_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1072 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="windows_pushed.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\122902009\Bedrock\app\browser\ginebra\chrome\bedrockchrome\toolbar.snippet\icons\windows1.png" - inkscape:export-xdpi="27" - inkscape:export-ydpi="27"><metadata - id="metadata2819"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2817"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective2821" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient2975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient2977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient2979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.01e-2,0,0,-2.47e-2,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient2981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-6.01e-2,0,0,-2.47e-2,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient2983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient2987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient2989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /><filter - id="filter2945" - inkscape:label="filter1"><feColorMatrix - id="feColorMatrix2947" - values="1.15 0 0 0 0 0 1.54 0 0 0 0 0 2 0 0 0 0 0 1 0 " /></filter><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_1_" - id="linearGradient2982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - x1="-5696632" - y1="-25848274" - x2="-5696632" - y2="-25848182" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_1_" - id="radialGradient2985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - cx="-5692351" - cy="-25844636" - r="44.5518" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_1_" - id="radialGradient2988" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - cx="6469965.5" - cy="-25844636" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_1_" - id="linearGradient2991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - x1="1661.9604" - y1="-15099.5195" - x2="1661.9277" - y2="-15087.6025" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_1_" - id="linearGradient2993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - x1="115.6006" - y1="-16289.2217" - x2="115.6006" - y2="-16278.958" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - x1="-883.5659" - y1="-17258.6777" - x2="-883.5659" - y2="-17252.0938" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_1_" - id="radialGradient2997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - cx="3816.7896" - cy="-12854.6943" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_1_" - id="radialGradient2999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - cx="3818.1138" - cy="-12661.1924" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_1_" - id="radialGradient3001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - cx="3819.438" - cy="-12570.4268" - r="0.403" /><linearGradient - inkscape:collect="always" - xlink:href="#rect4173_2_" - id="linearGradient3003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - x1="-5693561" - y1="-25828908" - x2="-5693561" - y2="-25828816" /><radialGradient - inkscape:collect="always" - xlink:href="#path5058_2_" - id="radialGradient3005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - cx="-5689279.5" - cy="-25825270" - r="44.5556" /><radialGradient - inkscape:collect="always" - xlink:href="#path5018_2_" - id="radialGradient3007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - cx="6466894" - cy="-25825270" - r="44.5603" /><linearGradient - inkscape:collect="always" - xlink:href="#rect1887_2_" - id="linearGradient3009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - x1="1665.1802" - y1="-15094.4375" - x2="1665.1475" - y2="-15082.5205" /><linearGradient - inkscape:collect="always" - xlink:href="#rect6287_2_" - id="linearGradient3011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - x1="119.6006" - y1="-16283.2227" - x2="119.6006" - y2="-16272.959" /><radialGradient - inkscape:collect="always" - xlink:href="#path6289_2_" - id="radialGradient3013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - cx="3818.9258" - cy="-12851.3418" - r="0.4038" /><radialGradient - inkscape:collect="always" - xlink:href="#path6291_2_" - id="radialGradient3015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - cx="3820.25" - cy="-12657.9893" - r="0.4032" /><radialGradient - inkscape:collect="always" - xlink:href="#path6293_2_" - id="radialGradient3017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - cx="3821.5742" - cy="-12567.293" - r="0.403" /> - <foreignObject - id="foreignObject2667" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<radialGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="radialGradient3122" - gradientUnits="userSpaceOnUse" - cx="46.295399" - cy="53.794899" - r="31.7957" /><filter - id="filter3297" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3299" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3301" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="839" - inkscape:window-width="1472" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.88" - inkscape:cx="-10.993167" - inkscape:cy="59.464937" - inkscape:window-x="40" - inkscape:window-y="205" - inkscape:current-layer="g3127" - inkscape:window-maximized="0" /> -<g - id="g2669" - i:extraneous="self" - transform="matrix(1.5482276,0,0,1.5482269,-21.675184,-33.288405)"> - <symbol - viewBox="-10.363 -10.473 20.727 20.945" - id="switchwindows_x5F_icon"> - <g - id="layer1_13_"> - <g - id="g5526_4_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_5_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.5)" - y2="-25848182" - x2="-5696632" - y1="-25848274" - x1="-5696632" - gradientUnits="userSpaceOnUse" - id="rect4173_1_"> - <stop - id="stop2676" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2678" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2680" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient2982)" - points="-2343.865,-3315.15 -2343.865,-3315.15 -1834.583,-3315.15 -1834.583,-3497.024 -2343.865,-3497.024 " - id="rect4173_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.5)" - r="44.5518" - cy="-25844636" - cx="-5692351" - id="path5058_1_"> - <stop - id="stop2684" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2686" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2985)" - d="m -1834.583,-3315.15 0,-181.875 c 54.303,-0.389 131.275,40.719 131.275,90.859 -10e-4,50.297 -60.613,91.016 -131.275,91.016 z" - id="path5058_5_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.5)" - r="44.560299" - cy="-25844636" - cx="6469965.5" - id="path5018_1_"> - <stop - id="stop2690" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2692" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient2988)" - d="m -2343.865,-3315.15 0,-181.875 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.297 60.612,91.016 131.32,91.016 z" - id="path5018_5_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.807)" - y2="-15087.603" - x2="1661.9277" - y1="-15099.52" - x1="1661.9604" - gradientUnits="userSpaceOnUse" - id="rect1887_1_"> - <stop - id="stop2696" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2698" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2700" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2991);stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.972 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 10e-4,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_7_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -9.033,9.592 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_7_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.102)" - y2="-16278.958" - x2="115.6006" - y1="-16289.222" - x1="115.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_1_"> - <stop - id="stop2705" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2707" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2993)" - d="m -8.842,7.12 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_7_" /> - <g - transform="translate(40.86706,-25.532011)" - id="g5278_1_"> - - <linearGradient - gradientTransform="matrix(0.893,0,0,-0.8877,751.48,-15294.375)" - y2="-17252.094" - x2="-883.56592" - y1="-17258.678" - x1="-883.56592" - gradientUnits="userSpaceOnUse" - id="path2262_2_"> - <stop - id="stop2712" - style="stop-color:#D6E26B" - offset="0" /> - <stop - id="stop2714" - style="stop-color:#8DAC3D" - offset="1" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0" /> - <a:midPointStop - style="stop-color:#D6E26B" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8DAC3D" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient2995);stroke:#437839;stroke-linejoin:round" - d="m -38.863,24.479 0,1.901 2.648,0 0,-1.901 1.901,0 0,-2.661 -1.901,0 0,-1.9 -2.65,0 -0.011,1.9 -1.9,0 0,2.661 1.913,0 z" - id="path2262_1_" /> - <path - style="opacity:0.6;fill:none;stroke:#437839" - d="m -38.496,24.1 0,1.9 1.902,0 0,-1.9 1.899,0 0,-1.872 -1.899,0.005 0,-1.935 -1.902,0 0,1.9 -1.9,0 0,1.902 1.9,0 z" - id="path2272_1_" /> - </g> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.168)" - r="0.40380001" - cy="-12854.694" - cx="3816.7896" - id="path6289_1_"> - <stop - id="stop2719" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2721" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2997)" - d="M 4.843,8.451 C 4.844,8.137 4.588,7.881 4.274,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.633)" - r="0.40380001" - cy="-12661.192" - cx="3818.1138" - id="path6291_1_"> - <stop - id="stop2725" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2727" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient2999)" - d="m 3.323,8.451 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_7_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.859)" - r="0.403" - cy="-12570.427" - cx="3819.438" - id="path6293_1_"> - <stop - id="stop2731" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2733" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3001)" - d="M 1.801,8.451 C 1.802,8.137 1.547,7.881 1.233,7.88 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_7_" /> - </g> - </g> - <g - id="layer1_12_"> - <g - id="g5526_3_"> - <g - style="opacity:0.58730002" - transform="matrix(0.02167025,0,0,0.01254292,43.274287,39.390183)" - id="g5022_4_"> - - <linearGradient - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.38,-641767.56)" - y2="-25828816" - x2="-5693561" - y1="-25828908" - x1="-5693561" - gradientUnits="userSpaceOnUse" - id="rect4173_2_"> - <stop - id="stop2740" - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <stop - id="stop2742" - style="stop-color:#010101" - offset="0.5" /> - <stop - id="stop2744" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </linearGradient> - <polygon - style="opacity:0.40209997;fill:url(#linearGradient3003)" - points="-2159.278,-3793.567 -2159.278,-3793.567 -1649.997,-3793.567 -1649.997,-3975.441 -2159.278,-3975.441 " - id="rect4173_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0601,0,0,-0.0247,340278.91,-641767.56)" - r="44.555599" - cy="-25825270" - cx="-5689279.5" - id="path5058_2_"> - <stop - id="stop2748" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2750" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3005)" - d="m -1649.997,-3793.567 0,-181.874 c 54.304,-0.389 131.275,40.719 131.275,90.859 0,50.296 -60.612,91.015 -131.275,91.015 z" - id="path5058_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.0601,0,0,-0.0247,386497.81,-641767.56)" - r="44.560299" - cy="-25825270" - cx="6466894" - id="path5018_2_"> - <stop - id="stop2754" - style="stop-color:#010101" - offset="0" /> - <stop - id="stop2756" - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#010101" - offset="0" /> - <a:midPointStop - style="stop-color:#010101" - offset="0.5" /> - <a:midPointStop - style="stop-color:#010101;stop-opacity:0" - offset="1" /> - </radialGradient> - <path - style="opacity:0.40209997;fill:url(#radialGradient3007)" - d="m -2159.278,-3793.567 0,-181.874 c -54.349,-0.389 -131.32,40.719 -131.32,90.859 0,50.296 60.613,91.015 131.32,91.015 z" - id="path5018_4_" /> - </g> - - <linearGradient - gradientTransform="matrix(1.2424,0,0,-1.1803,-2066.7993,-17811.809)" - y2="-15082.521" - x2="1665.1475" - y1="-15094.438" - x1="1665.1802" - gradientUnits="userSpaceOnUse" - id="rect1887_2_"> - <stop - id="stop2760" - style="stop-color:#515151" - offset="0" /> - <stop - id="stop2762" - style="stop-color:#6F6F6F" - offset="0.1322" /> - <stop - id="stop2764" - style="stop-color:#8C8C8C" - offset="1" /> - <a:midPointStop - style="stop-color:#515151" - offset="0" /> - <a:midPointStop - style="stop-color:#515151" - offset="0.5" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.1322" /> - <a:midPointStop - style="stop-color:#6F6F6F" - offset="0.5" /> - <a:midPointStop - style="stop-color:#8C8C8C" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3009);stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.971 14.066,0 c 0.421,0 0.761,-0.341 0.761,-0.76 l 0,-12.165 c 0,-0.42 -0.34,-0.761 -0.761,-0.761 l -14.066,0 c -0.419,0 -0.76,0.341 -0.76,0.761 l 0,12.165 c 0.001,0.419 0.341,0.76 0.76,0.76 z" - id="rect1887_4_" /> - <path - style="opacity:0.2;fill:none;stroke:#575954;stroke-width:1.00010002" - d="m -5.033,3.591 14.066,0 c 0.211,0 0.381,-0.17 0.381,-0.38 l 0,-12.165 c 0,-0.21 -0.17,-0.381 -0.381,-0.381 l -14.066,0 c -0.209,0 -0.38,0.171 -0.38,0.381 l 0,12.165 c 0,0.21 0.171,0.38 0.38,0.38 z" - id="rect2779_4_" /> - - <linearGradient - gradientTransform="matrix(1,0,0,-1,-117.5991,-16282.103)" - y2="-16272.959" - x2="119.6006" - y1="-16283.223" - x1="119.6006" - gradientUnits="userSpaceOnUse" - id="rect6287_2_"> - <stop - id="stop2769" - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <stop - id="stop2771" - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.9412" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0.7059" - offset="1" /> - </linearGradient> - <path - style="fill:url(#linearGradient3011)" - d="m -4.842,1.119 13.685,0 c 0.21,0 0.38,-0.17 0.38,-0.38 l 0,-9.503 c 0,-0.21 -0.17,-0.381 -0.38,-0.381 l -13.685,0 c -0.21,0 -0.38,0.171 -0.38,0.381 l 0,9.503 c 0,0.21 0.17,0.38 0.38,0.38 z" - id="rect6287_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.7892,-7142.6665,-22991.17)" - r="0.40380001" - cy="-12851.342" - cx="3818.9258" - id="path6289_2_"> - <stop - id="stop2775" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2777" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3013)" - d="M 8.843,2.45 C 8.844,2.136 8.588,1.88 8.274,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.314,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6289_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.8725,-7146.6665,-23699.635)" - r="0.4032" - cy="-12657.989" - cx="3820.25" - id="path6291_2_"> - <stop - id="stop2781" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2783" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3015)" - d="m 7.323,2.45 c 0,-0.314 -0.255,-0.57 -0.57,-0.571 -0.314,0 -0.569,0.255 -0.57,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.255,0.571 0.569,0.571 0.315,0 0.571,-0.254 0.571,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6291_4_" /> - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8725,0,0,-1.9142,-7150.6665,-24053.861)" - r="0.403" - cy="-12567.293" - cx="3821.5742" - id="path6293_2_"> - <stop - id="stop2787" - style="stop-color:#F8CE71" - offset="0" /> - <stop - id="stop2789" - style="stop-color:#CB922B" - offset="1" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0" /> - <a:midPointStop - style="stop-color:#F8CE71" - offset="0.5" /> - <a:midPointStop - style="stop-color:#CB922B" - offset="1" /> - </radialGradient> - <path - style="fill:url(#radialGradient3017)" - d="M 5.801,2.45 C 5.802,2.136 5.547,1.88 5.233,1.879 c -0.315,0 -0.57,0.255 -0.571,0.569 0,10e-4 0,0.002 0,0.002 0,0.314 0.254,0.571 0.569,0.571 0.314,0 0.57,-0.254 0.57,-0.571 0,10e-4 0,10e-4 0,0 z" - id="path6293_4_" /> - </g> - </g> - </symbol> - <radialGradient - gradientUnits="userSpaceOnUse" - r="31.7957" - cy="53.794899" - cx="46.295399" - id="SVGID_1_"> - <stop - id="stop2793" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2795" - style="stop-color:#FCFCFC" - offset="0.4337" /> - <stop - id="stop2797" - style="stop-color:#F5F5F5" - offset="0.5899" /> - <stop - id="stop2799" - style="stop-color:#EBEBEC" - offset="0.7013" /> - <stop - id="stop2801" - style="stop-color:#DCDEDF" - offset="0.7913" /> - <stop - id="stop2803" - style="stop-color:#CACCCE" - offset="0.8684" /> - <stop - id="stop2805" - style="stop-color:#B4B6B8" - offset="0.9355" /> - <stop - id="stop2807" - style="stop-color:#9B9DA0" - offset="0.9959" /> - <stop - id="stop2809" - style="stop-color:#999B9E" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.87" /> - <a:midPointStop - style="stop-color:#999B9E" - offset="1" /> - </radialGradient> - - - - <g - id="g3127" - style="filter:url(#filter3297)"><circle - transform="translate(9.5229906e-6,-1.288025e-5)" - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle2811" - style="fill:url(#radialGradient3122);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /><use - inkscape:label="#XMLID_1_" - xlink:href="#switchwindows_x5F_icon" - width="20.726999" - height="20.945" - id="WIND_GRAPHIC" - x="-10.363" - y="-10.473" - transform="matrix(1.9449459,0,0,-1.9300204,46.295594,53.796313)" - overflow="visible" - style="overflow:visible;filter:url(#filter2945)" /> -</g> - - - - </g> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,428 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.02" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="44" - inkscape:window-y="44" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch50036" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject50038"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g50040"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50079" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop50081" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop50083" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop50089" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop50091" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop50098" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop50100" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50104" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50106" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,363 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom+_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,445 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><filter - id="filter2865" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2867" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2869" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.02" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="526" - inkscape:window-y="265" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch50036" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)" - style="filter:url(#filter2865)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject50038"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g50040"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50079" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop50081" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop50083" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop50089" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop50091" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop50098" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop50100" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50104" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50106" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,431 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata49866"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs49864"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective49868" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.1553062" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="154" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch49789" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject49791"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g49793"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop49797" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop49799" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49803" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49805" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49809" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop49811" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop49813" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop49815" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop49817" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop49819" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop49821" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop49823" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop49825" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle49827" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49832" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop49834" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop49836" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop49842" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop49844" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop49851" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop49853" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49857" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49859" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_disabled.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_pushed.png Binary file ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_pushed.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom-_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,448 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata49866"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs49864"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective49868" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><filter - id="filter3107" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3109" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3111" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.1553062" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="154" - inkscape:window-y="179" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch49789" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)" - style="filter:url(#filter3107)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject49791"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g49793"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop49797" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop49799" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49803" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49805" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49809" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop49811" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop49813" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop49815" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop49817" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop49819" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop49821" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop49823" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop49825" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle49827" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49832" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop49834" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop49836" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop49842" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop49844" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop49851" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop49853" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49857" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49859" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata22954"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs22952"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective22956" /><radialGradient - inkscape:collect="always" - xlink:href="#path2982_2_" - id="radialGradient2846" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - cx="981.9658" - cy="-15413.6816" - r="8.3145" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_2_" - id="linearGradient2848" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="176" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch22901" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject22903"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g22905"> - <symbol - id="zoom" - viewBox="-13.119 -13.113 26.237 26.226"> - <g - id="g4042_2_" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029_1_" - nodetypes="ccccc" - d="M 2.914,-6.105 4.099,-4.92 6.073,-6.894 4.887,-8.079 2.914,-6.105 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_2_" - cx="981.96582" - cy="-15413.682" - r="8.3144999" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop22911" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop22913" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop22915" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="opacity:0.6;fill:url(#radialGradient2846)" /> - - <path - id="path2994_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.466,1.395 c 0,-5.451 -4.417,-9.868 -9.868,-9.868 -5.45,0 -9.868,4.417 -9.868,9.868 l 0,0 c 0,5.45 4.418,9.868 9.868,9.868 5.451,0 9.868,-4.418 9.868,-9.868 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080_1_" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 4.098,-7.685 c -0.02,0.777 0.804,1.525 1.579,1.58 2.184,-1.591 4.198,-3.278 5.921,-5.132 0.165,-1.843 -0.78,-2.454 -2.368,-2.368 -1.882,1.723 -3.644,3.608 -5.132,5.92 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_2_" - gradientUnits="userSpaceOnUse" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop22921" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop22923" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995_1_" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 3.378,4.601 c -1.752,-7.379 -11.66,-0.274 -13.561,-6.413 1.77,-3.742 6.243,-5.344 9.985,-3.574 3.744,1.769 5.345,6.243 3.576,9.987 z" - style="opacity:0.8;fill:url(#linearGradient2848)" /> - - <path - id="path2944_1_" - open="true" - end="4.2666097" - start="2.3770938" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - d="m -10.643,-1.746 c -1.734,3.999 0.102,8.647 4.101,10.382 0.77,0.334 1.59,0.544 2.427,0.619" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop22929" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop22931" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22933" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop22935" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop22937" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop22939" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22941" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop22943" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop22945" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle22947" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#zoom" - width="26.237" - height="26.226" - x="-13.119" - y="-13.113" - transform="matrix(1.5567,0,0,-1.5567,44.9927,52.7305)" - overflow="visible" - id="use22949" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom1.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom1.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata22954"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs22952"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective22956" /><radialGradient - inkscape:collect="always" - xlink:href="#path2982_2_" - id="radialGradient2846" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - cx="981.9658" - cy="-15413.6816" - r="8.3145" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_2_" - id="linearGradient2848" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="176" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch22901" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject22903"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g22905"> - <symbol - id="zoom" - viewBox="-13.119 -13.113 26.237 26.226"> - <g - id="g4042_2_" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029_1_" - nodetypes="ccccc" - d="M 2.914,-6.105 4.099,-4.92 6.073,-6.894 4.887,-8.079 2.914,-6.105 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_2_" - cx="981.96582" - cy="-15413.682" - r="8.3144999" - gradientTransform="matrix(1.1394,0,0,-1.1394,-1122.2534,-17560.953)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop22911" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop22913" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop22915" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="opacity:0.6;fill:url(#radialGradient2846)" /> - - <path - id="path2994_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.466,1.395 c 0,-5.451 -4.417,-9.868 -9.868,-9.868 -5.45,0 -9.868,4.417 -9.868,9.868 l 0,0 c 0,5.45 4.418,9.868 9.868,9.868 5.451,0 9.868,-4.418 9.868,-9.868 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080_1_" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 4.098,-7.685 c -0.02,0.777 0.804,1.525 1.579,1.58 2.184,-1.591 4.198,-3.278 5.921,-5.132 0.165,-1.843 -0.78,-2.454 -2.368,-2.368 -1.882,1.723 -3.644,3.608 -5.132,5.92 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_2_" - gradientUnits="userSpaceOnUse" - x1="3756.7271" - y1="3385.4365" - x2="3756.2461" - y2="3376.5728" - gradientTransform="matrix(0.8155,0.3855,-0.3786,0.8008,-1785.1392,-4158.2275)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop22921" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop22923" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995_1_" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 3.378,4.601 c -1.752,-7.379 -11.66,-0.274 -13.561,-6.413 1.77,-3.742 6.243,-5.344 9.985,-3.574 3.744,1.769 5.345,6.243 3.576,9.987 z" - style="opacity:0.8;fill:url(#linearGradient2848)" /> - - <path - id="path2944_1_" - open="true" - end="4.2666097" - start="2.3770938" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - d="m -10.643,-1.746 c -1.734,3.999 0.102,8.647 4.101,10.382 0.77,0.334 1.59,0.544 2.427,0.619" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042_1_" - cx="60.532116" - ry="10.724427" - cy="24.724428" - rx="10.532116" - type="arc" - d="m 6.072,1.395 c 0,-5.231 -4.242,-9.474 -9.474,-9.474 -5.232,0 -9.474,4.242 -9.474,9.474 l 0,0 c 0,5.231 4.242,9.474 9.474,9.474 5.232,0 9.474,-4.243 9.474,-9.474 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop22929" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop22931" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22933" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop22935" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop22937" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop22939" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop22941" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop22943" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop22945" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle22947" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - - <use - xlink:href="#zoom" - width="26.237" - height="26.226" - x="-13.119" - y="-13.113" - transform="matrix(1.5567,0,0,-1.5567,44.9927,52.7305)" - overflow="visible" - id="use22949" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom_disabled.svg --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/icons/zoom_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="37" - inkscape:window-y="99" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/toolbar.css --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/toolbar.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -.ToolBar { - height: 52px; - background: transparent; - //background: black; -} - -/* CSS properties when not using table to layout */ - -.toolBarTable{ - width: 100%; - border-collapse:collapse; -} - -.toolBarHidden{ - visibility: visible; - } - -.toolBarBtnCell { - text-align: center; - // border: 1px solid red; - // border-left: 1px solid #AAAAAA; - // border-right: 1px solid #BBBBBB;; - } - -.toolbarBtn{ - height: 40px; - width: 40px; - margin-top: 5px; - margin-bottom: 7px; - -webkit-user-drag: none; - -webkit-user-select: none; -} - -.btnBorder{ - margin-top: 5px; - margin-bottom: 7px; - } - -/* Add extra buttons to rightmost, leftmost button to pad them */ -.lastButton{ - margin-right: 12px; -} - -.firstButton { - margin-left: 12px; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/toolbar2.snippet/toolbar.js --- a/ginebra/chrome/bedrockchrome/toolbar2.snippet/toolbar.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,611 +0,0 @@ - -var tbCb; - -/* create all functions with toolbar.* */ -// -// INIT the webView Toolbar -// - -/* Fade functions - modified the 3rdparty solution*/ -var FadeAnim = { - - fade : function (id) { - opacity = 96; - this.fadeLoop(id, opacity); - }, - fadeLoop : function (id, opacity) { - var o = document.getElementById(id); - if (opacity >= 5) { - FadeAnim.setOpacity(o, opacity); - opacity -= 4; - window.setTimeout("FadeAnim.fadeLoop('" + id + "', " + opacity + ")", 50); - } else { -// o.style.display = "none"; - o.style.visibility = 'hidden'; - //window.chrome.alert("Menu is " + o.style.visibility); - tbCb("hideCplt"); - - } - }, - setOpacity : function (o, opacity) { - o.style.filter = "alpha(style=0,opacity:" + opacity + ")"; // IE - o.style.KHTMLOpacity = opacity / 100; // Konqueror - o.style.MozOpacity = opacity / 100; // Mozilla (old) - o.style.opacity = opacity / 100; // Mozilla (new) - }, - - show : function (id) { - opacity = 4; - this.showLoop(id, opacity); - }, - showLoop : function (id, opacity) { - var o = document.getElementById(id); - if (opacity <= 100) { - FadeAnim.setOpacity(o, opacity); - opacity += 4; - window.setTimeout("FadeAnim.showLoop('" + id + "', " + opacity + ")", 50); - } - else { - tbCb("showCplt"); - } - } -} - -/* Utility functions */ -function Util() { - - /* Utility function to strip off the given string - */ - function convertToValue(num, str) { - - var i = num.indexOf(str); - var value = 0; - if (i > -1) { - value = num.slice(0, i); - } - return Number(value); - } - - /* Get the first button if of the toolbar specified by 'view' */ - function firstBtn(tbId) { - var rowid = getRowId(tbId); - return (document.getElementById(rowid).firstChild.id); - } - - /* Get the last button if of the toolbar specified by 'view' */ - function lastBtn(tbId) { - var rowid = getRowId(tbId); - return (document.getElementById(rowid).lastChild.id); - } - - /* Get the row id of the toolbar specified by 'view' */ - function getRowId(tbId) { - var id; - switch( tbId) { - case "WebViewToolbarId": - id = "webViewRow"; - break; - case "WebViewMiniToolbarId": - id = "webViewMiniRow"; - break; - case "HistoryViewToolbarId": - id = "historyRow"; - break; - case "BookmarkViewToolbarId": - id = "bookmarkRow"; - break; - case "BookmarkHistoryViewToolbarId": - id = "bookmarkHistoryRow"; - break; - case "WindowViewToolbarId": - id = "windowRow"; - break; - default: - break; - } - return id; - - } - - /* This function calculates the margin-right needed */ - this.setMarginRight = function(tbId) { - - /* Get the total number of images in the toolbar */ - var firstIcon = firstBtn(tbId); - - var el = document.getElementById(getRowId(tbId)); - Icons = el.getElementsByTagName("img"); - - numIcons = Icons.length; - /* Get total width and total width od all icons */ - var iconW = document.getElementById(firstIcon).offsetWidth; - var totalW = document.getElementById(tbId).offsetWidth; - var totalIconW= (iconW * numIcons); - var firstobj = document.getElementById(firstIcon); - var lastObj = document.getElementById(lastBtn(tbId)); - - switch (numIcons) { - case 1: - /* Only one icon */ - var leftMarginStr=document.defaultView.getComputedStyle(firstobj, '').getPropertyValue("margin-left"); - var leftMargin = convertToValue(leftMarginStr, "px"); - - var marginRight = totalW - totalIconW - leftMargin; - Icons[0].style.marginRight = marginRight + "px"; - break; - - default: - /* More than two buttons */ - var leftMarginStr=document.defaultView.getComputedStyle(firstobj, '').getPropertyValue("margin-left"); - var rightmarginStr=document.defaultView.getComputedStyle(lastObj, '').getPropertyValue("margin-right"); - var leftMargin = convertToValue(leftMarginStr, "px"); - var rightMargin = convertToValue(rightmarginStr, "px"); - var totalMargin = rightMargin + leftMargin ; - - - /* Now determine remaining space */ - var marginRight = (totalW - totalIconW - totalMargin)/(numIcons - 1); - for (var i = 0; i < numIcons; i++ ) { - - if (i !== (numIcons-1) ){ - Icons[i].style.marginRight = marginRight + "px"; - } - } - break; - } - - } -} - -/* create all functions with toolbar.* */ -// -// INIT the webView Toolbar -// - -function WebViewToolbar() -{ - - var utils = new Util(); - var menuTimeoutCb = _hideToolbar; - var menuTimeoutId = 0; - tbCb = _handleToolbarMenuCb; - - - //Private methods - //write webview toolbar HTML code to document - function _writeWebViewToolbar() { - var html = ''+ - '<span id="webViewRow" style="width:100%">'+ - '<img class="toolBarBtn firstButton" id="backButton" >'+ - '<span id="menu" >'+ - '<img class="toolBarBtn" id="zoomIn" >'+ - '<img class="toolBarBtn" id="zoomOut" >'+ - '<img class="toolBarBtn" id="winButton" >'+ - '<img class="toolBarBtn" id="contextMenuButton" >'+ - '</span>'+ - '<img class="toolBarBtn lastButton" id="mvButton">'+ - '</span>'; - document.write(html); - - // We can immediately set up the simple buttons - // ActionButtons have to wait until the page is loaded - var index = window.pageController.pageCount(); - var base = "toolbar2.snippet/fjicons/windows" + index; - new SimpleButton("winButton", - base + ".png", - base + "_pushed.png", - base + ".png", - _goToWindowView); - - new SimpleButton("mvButton", - "toolbar2.snippet/fjicons/mostVisited.png", - "toolbar2.snippet/fjicons/mostVisited_pushed.png", - "toolbar2.snippet/fjicons/mostVisited.png", - _activateMostVisited); - - - - new SimpleButton("contextMenuButton", - "toolbar2.snippet/fjicons/menu.png", - "toolbar2.snippet/fjicons/menu_pushed.png", - "toolbar2.snippet/fjicons/menu.png", - _contextMenuF); -// document.getElementById("menu").style.visibility = 'hidden'; - utils.setMarginRight("WebViewToolbarId"); - } - - /* Adds the back action button using ActionButton from ../../js/ActionButton.js */ - function _setActions () { - new ActionButton("backButton", - "toolbar2.snippet/fjicons/back.png", - "toolbar2.snippet/fjicons/back_pushed.png", - "toolbar2.snippet/fjicons/back_disabled.png", - window.pageController.actions.back); - - new ActionButton("zoomIn", - "toolbar2.snippet/fjicons/zoom+.png", - "toolbar2.snippet/fjicons/zoom+_pushed.png", - "toolbar2.snippet/fjicons/zoom+_disabled.png", - window.webView.actions.zoomIn); - - - new ActionButton("zoomOut", - "toolbar2.snippet/fjicons/zoom-.png", - "toolbar2.snippet/fjicons/zoom-_pushed.png", - "toolbar2.snippet/fjicons/zoom-_disabled.png", - window.webView.actions.zoomOut); - - /* Add 'addWindow' action */ - new ActionButton("addWindow", - "toolbar2.snippet/fjicons/addwindow.png", - "toolbar2.snippet/fjicons/addwindow_pushed.png", - "toolbar2.snippet/fjicons/addwindow_disabled.png", - window.viewManager.WindowView.actions.addWindow); - } - - var timeoutId = 0; - function _contextMenuF () - { - var hideFlag = 0; - - hideFlag = window.snippets.ContextMenuId.getContextMenuFlag(); - - if(hideFlag == 1) - { - window.snippets.ContextMenuBgId.hide(); - window.snippets.ContextMenuId.hide(); - return; - } - - - clearTimeout(timeoutId); - - window.snippets.ContextMenuBgId.setPosition(0,20); - window.snippets.ContextMenuBgId.show(); - window.snippets.ContextMenuBgId.zValue = 1; - - window.snippets.ContextMenuId.repaint(); - if (window.snippets.ContextMenuId.getDisplayMode() == "portrait") - window.snippets.ContextMenuId.setPosition(83,270); - else //landscape - window.snippets.ContextMenuId.setPosition(223,130); - - window.snippets.ContextMenuId.show(); - window.snippets.ContextMenuId.zValue = 10; - - timeoutId = setTimeout ( 'window.snippets.ContextMenuId.hide(); window.snippets.ContextMenuBgId.hide()', 6000 ); // close the menu after 6 secs -// _showToolbar(); - } - - /* Update the windows icon based on the number of windows open */ - function _changeWindowIcon () { - var index = window.pageController.pageCount(); - var base = "toolbar2.snippet/fjicons/windows" + index; - - document.getElementById('winButton').button.updateImages(base + ".png", - base + "_pushed.png", - base + ".png"); - //window.snippets.repaint("WebViewToolbarId"); - - } - - function _goToWindowView () { - window.viewStack.switchView("WindowView", "webView"); - } - - function _goToGoAnywhereView () { - /* Change to history view */ - window.viewStack.switchView("goAnywhereView", "webView"); - } - - function _goToBookmarkView () { - /* Change to Bookmark view */ - window.viewStack.switchView("bookmarkTreeView", "webView"); - } - - function _goToRecentUrlView () { - window.viewStack.switchView("bookmarkHistoryView", "webView"); - } - - function _activateMostVisited () { - - } - - function _chromeLoadComplete () { - _setActions(); - _changeWindowIcon(); - - /* Connect to pageCreated signal */ - window.pageController.pageCreated.connect(_changeWindowIcon); - - /* - window.pageController.loadStarted.connect(_showToolbar); - window.pageController.loadFinished.connect(startMenuHideTimer); - window.pageController.pageScrollRequested.connect(_showToolbar); - */ - } - - function _showToolbar() { - var el = document.getElementById("menu"); - //window.chrome.alert("show Toolbar " + el.style.visibility); - if (el.style.visibility != 'visible') { - document.getElementById("menu").style.visibility = 'visible'; - FadeAnim.show("menu"); - } - } - - function startMenuHideTimer() { - - //window.chrome.alert("startMenuHideTimer"); - var el = document.getElementById("menu"); - if (el.style.visibility == 'visible' && (!menuTimeoutId) ) { - //window.chrome.alert("startMenuHideTimer: started timer"); - //menuTimeoutId = setTimeout ('_hideToolbar()', 1000); - menuTimeoutId = setTimeout (menuTimeoutCb, 3000); - } - } - - function _hideToolbar() { - //window.chrome.alert("hideToolbar " + document.getElementById("menu").style.visibility); - - var el = document.getElementById("menu"); - - clearTimeout(menuTimeoutId); - menuTimeoutId = 0; - - if (el.style.visibility != 'hidden' ) { - FadeAnim.fade("menu"); - //window.chrome.alert("hide Toolbar " + document.getElementById("menu").style.visibility); - } - } - - function _handleToolbarMenuCb(x) { - - if (x == "showCplt" ) { - startMenuHideTimer(); - } - else if (x == "hideCplt"){ - - } - } - - function _activateBookmark () { - window.chrome.toggleVisibility("BookmarkViewToolbarId"); - } - - function _deActivateBookmark () { - window.chrome.toggleVisibility("BookmarkViewToolbarId"); - } - - function _activateHistory () { - window.chrome.toggleVisibility("HistoryViewToolbarId"); - } - - function _deActivateHistory () { - window.chrome.toggleVisibility("HistoryViewToolbarId"); - } - - function _activateBookMarkHistory () { - window.chrome.toggleVisibility("BookmarkHistoryViewToolbarId"); - } - - function _deActivateBookMarkHistory () { - window.chrome.toggleVisibility("BookmarkHistoryViewToolbarId"); - } - - function _activateWebView () { - window.chrome.toggleVisibility("WebViewToolbarId"); - } - - function _deActivateWebView () { - window.chrome.toggleVisibility("WebViewToolbarId"); - } - - function _activateWindowView () { - - window.chrome.alert("_activateWindowView"); - - /* Show the window count snippet */ - document.getElementById('WindowCountBarId').wcChrome.wcUpdateWindowHtml(); - window.chrome.toggleVisibility("WindowCountBarId"); - - window.chrome.toggleVisibility("WindowViewToolbarId"); - } - - function _deActivateWindowView () { - - window.chrome.toggleVisibility("WindowCountBarId"); - window.chrome.toggleVisibility("WindowViewToolbarId"); - - /* Set the windows icon based on the number of windows */ - _changeWindowIcon(); - } - - function _pageChanged() { - _changeWindowIcon(); - window.chrome.alert("_pageChanged"); - document.getElementById('WindowCountBarId').wcChrome.wcUpdateWindowHtml(); - } - - function _updateToolbar() { - utils.setMarginRight("WebViewToolbarId"); - - } - - _writeWebViewToolbar(); - window.chrome.loadComplete.connect(_chromeLoadComplete); - window.viewStack.activateBookmark.connect(_activateBookmark); - window.viewStack.deActivateBookmark.connect(_deActivateBookmark); - window.viewStack.activateHistory.connect(_activateHistory); - window.viewStack.deActivateHistory.connect(_deActivateHistory); - window.viewStack.activateBookMarkHistory.connect(_activateBookMarkHistory); - window.viewStack.deActivateBookMarkHistory.connect(_deActivateBookMarkHistory); - window.viewStack.activateWebView.connect(_activateWebView); - window.viewStack.deActivateWebView.connect(_deActivateWebView); - window.viewStack.activateWindowView.connect(_activateWindowView); - window.viewStack.deActivateWindowView.connect(_deActivateWindowView); - window.viewStack.pageChanged.connect(_pageChanged); - window.chrome.onDisplayModeChanged.connect(_updateToolbar); - window.chrome.viewPortResize.connect(_updateToolbar); - -} //end of class webViewToolbar - - -// INIT the History View Toolbar -function HistoryViewToolbar() -{ - //Private methods - //write historyview toolbar HTML code to document - function _writeHistoryViewToolbar() { - var tbhtml = ''+ - //'<span id="historyRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewHist">'+ - //'</span>'; - - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=100%;"><img class="toolBarBtn" id="goBacktoWebViewHist"></td>'+ - '</tr>' + - '</table>'; - document.write(tbhtml); - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewHist", - "toolbar2.snippet/fjicons/back.png", - "toolbar2.snippet/fjicons/back_pushed.png", - "toolbar2.snippet/fjicons/back.png", - _goBackFromGoAnywhereView); - - } - - _goBackFromGoAnywhereView = function() { - window.viewStack.switchView("webView", "goAnywhereView"); - } - - _writeHistoryViewToolbar(); - -} //end of class HistoryViewToolbar - -// INIT the bookmark View Toolbar -function BookmarkViewToolbar() -{ - //Private methods - //write webview toolbar HTML code to document - function _writeBookmarkViewToolbar() { - var tbhtml = ''+ - //'<span id="bookmarkRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewBM">'+ - //'<img class="toolBarBtn lastButton" id="addToBookMark">'+ - //'</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="goBacktoWebViewBM"></td>'+ - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="addToBookMark"></td>'+ - '</tr>'+ - '</table>'; - - document.write(tbhtml); - - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewBM", - "toolbar2.snippet/fjicons/back.png", - "toolbar2.snippet/fjicons/back_pushed.png", - "toolbar2.snippet/fjicons/back.png", - _goBackFromBookmarkView); - - /* add bookmark button as a simple button */ - new SimpleButton("addToBookMark", - "toolbar2.snippet/fjicons/addwindow.png", - "toolbar2.snippet/fjicons/addwindow_pushed.png", - "toolbar2.snippet/fjicons/addwindow.png", - _addCurrentPageToBookMark); - - } - - function _goBackFromBookmarkView () { - window.viewStack.switchView("webView", "bookmarkTreeView"); - } - - function _addCurrentPageToBookMark () { - /* Change to history view */ - window.chrome.addCurrentPageToBookMark(); - } - - - _writeBookmarkViewToolbar(); - -} - -// INIT the Bookmark History View Toolbar -function BookmarkHistoryViewToolbar() -{ - /* BookmarkHist View Toolbar */ - function _writeBookmarkHistoryViewToolbar() { - var tbhtml = ''+ - //'<span id="bookmarkHistoryRow" style="width:100%">'+ - //'<img class="toolBarBtn firstButton" id="goBacktoWebViewBMH">'+ - //'</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=100%;"><img class="toolBarBtn" id="goBacktoWebViewBMH"></td>'+ - '</tr>'+ - '</table>'; - document.write(tbhtml); - - /* add back button as a simple button */ - new SimpleButton("goBacktoWebViewBMH", - "toolbar2.snippet/fjicons/back.png", - "toolbar2.snippet/fjicons/back_pushed.png", - "toolbar2.snippet/fjicons/back.png", - _goBackFromRecentUrlView); - } - - /* This function changes the view to webView and updates the layout correspondingly */ - _goBackFromRecentUrlView = function() - { - window.viewStack.switchView("webView", "bookmarkHistoryView"); - } - - _writeBookmarkHistoryViewToolbar(); - -} - - -// INIT the Window View Toolbar -function WindowViewToolbar() -{ - /* Window View Toolbar */ - function _writeWindowToolbar() { - var tbhtml = ''+ - // '<span id="windowRow" style="width:100%">'+ - // '<img class="toolBarBtn firstButton" id="goBacktoWebViewWin">'+ - // '<img class="toolBarBtn" id="addWindow">'+ - // '</span>'; - '<table class="toolBarTable">' + - '<tr>' + - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="goBacktoWebViewWin"></td>'+ - '<td class="toolBarBtnCell" style="width=50%;"><img class="toolBarBtn" id="addWindow"></td>'+ - '</tr>'+ - '</table>'; - - - document.write(tbhtml); - - /* add back as simple button, add window is an action button */ - new SimpleButton("goBacktoWebViewWin", - "toolbar2.snippet/fjicons/back.png", - "toolbar2.snippet/fjicons/back_pushed.png", - "toolbar2.snippet/fjicons/back.png", - _goBackFromWindowView); - - } - - _goBackFromWindowView = function() { - window.viewStack.switchView("webView", "WindowView"); - } - _writeWindowToolbar(); -} - - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/defaultFavicon.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/defaultFavicon.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/defaultFavicon.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/defaultFavicon.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100" - height="100" - viewBox="0 0 100 100" - enable-background="new 0 0 360 359.998" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="defaultFavicon.svg"><metadata - id="metadata52"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 179.99899 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="360 : 179.99899 : 1" - inkscape:persp3d-origin="180 : 119.99933 : 1" - id="perspective54" /><linearGradient - inkscape:collect="always" - xlink:href="#SVGID_1_" - id="linearGradient2864" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.8182,0,0,-6.8182,-1679.8633,2666.5759)" - x1="265.76169" - y1="373.23831" - x2="279.66339" - y2="356.52869" /><radialGradient - inkscape:collect="always" - xlink:href="#SVGID_3_" - id="radialGradient2866" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.6885222,0,0,-2.6885222,-683.37301,1290.7774)" - cx="276.56641" - cy="374.54199" - r="22.5763" /></defs><sodipodi:namedview - pagecolor="#363436" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="1248" - inkscape:window-height="876" - id="namedview48" - showgrid="false" - inkscape:zoom="6.39" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="104" - inkscape:window-y="202" - inkscape:window-maximized="0" - inkscape:current-layer="g2860" /> -<linearGradient - id="SVGID_1_" - gradientUnits="userSpaceOnUse" - x1="265.76169" - y1="373.23831" - x2="279.66339" - y2="356.52869" - gradientTransform="matrix(6.8182,0,0,-6.8182,-1679.8633,2666.5759)"> - <stop - offset="0" - style="stop-color:#DEE9F3" - id="stop4" /> - <stop - offset="1" - style="stop-color:#235487" - id="stop6" /> -</linearGradient> - -<radialGradient - id="SVGID_2_" - cx="276.32031" - cy="376.37299" - r="33.187801" - gradientTransform="matrix(6.8182,0,0,-6.8182,-1679.8633,2666.5759)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop11" /> - <stop - offset="0.53" - style="stop-color:#A2C2DD" - id="stop13" /> - <stop - offset="0.87" - style="stop-color:#6C83BB" - id="stop15" /> - <stop - offset="1" - style="stop-color:#003D6D" - id="stop17" /> -</radialGradient> - -<radialGradient - id="SVGID_3_" - cx="276.56641" - cy="374.54199" - r="22.5763" - gradientTransform="matrix(6.8182,0,0,-6.8182,-1679.8633,2666.5759)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#E6EEF4" - id="stop22" /> - <stop - offset="0.08" - style="stop-color:#C6DCC1" - id="stop24" /> - <stop - offset="0.21" - style="stop-color:#91C06F" - id="stop26" /> - <stop - offset="0.32" - style="stop-color:#6BAB33" - id="stop28" /> - <stop - offset="0.4" - style="stop-color:#539E0E" - id="stop30" /> - <stop - offset="0.44" - style="stop-color:#4A9900" - id="stop32" /> - <stop - offset="0.55" - style="stop-color:#398419" - id="stop34" /> - <stop - offset="0.71" - style="stop-color:#22663B" - id="stop36" /> - <stop - offset="0.85" - style="stop-color:#135550" - id="stop38" /> - <stop - offset="0.94" - style="stop-color:#0E4E58" - id="stop40" /> -</radialGradient> -<g - id="g2860" - transform="translate(0,-259.998)"><circle - id="circle8" - r="126.802" - cy="179.28" - cx="180" - sodipodi:cx="180" - sodipodi:cy="179.28" - sodipodi:rx="126.802" - sodipodi:ry="126.802" - style="fill:url(#linearGradient2864)" - d="m 306.802,179.28 c 0,70.03081 -56.77119,126.802 -126.802,126.802 -70.03081,0 -126.802002,-56.77119 -126.802002,-126.802 0,-70.03081 56.771192,-126.802003 126.802002,-126.802003 70.03081,0 126.802,56.771193 126.802,126.802003 z" - transform="matrix(0.39431554,0,0,0.39431554,-20.976797,239.30511)" /><path - id="path42" - d="m 74.230292,326.46501 -3.09064,3.09144 c 0,0 -1.86157,0 -1.95344,0.74762 -0.041,0.31821 -0.15536,1.70108 -0.45938,2.4069 -0.61789,0.43217 -1.36157,1.85368 -1.36157,1.85368 0,0 -0.38051,2.7539 1.66953,2.28821 2.04926,-0.46687 5.4735,-6.28657 5.4735,-6.28657 0,0 2.05162,-4.56578 -0.278,-4.10128 z m -71.2346763,-16.3842 -1.219618,-0.40812 c 0,0.10962 -0.0083,0.21845 -0.0083,0.32728 0,1.15614 0.05481,2.2965 0.134068,3.43015 0.01617,0.24014 0.03391,0.48501 0.05481,0.72476 0.09661,1.13286 0.222393,2.25745 0.396681,3.36863 0.0071,0.0446 0.01774,0.0931 0.02445,0.13959 0.17547,1.10132 0.395104,2.18333 0.6451,3.2602 0.03549,0.15931 0.07098,0.31585 0.109619,0.47594 0.270895,1.11591 0.575307,2.22433 0.924276,3.31067 0.0032,0.0114 0.0083,0.0233 0.01065,0.0347 0.03549,-0.39352 0.05323,-0.79691 0.03943,-1.21291 -0.09385,-2.87259 -0.556773,-2.5039 -0.556773,-2.5039 l 0.741707,-0.55836 2.505481,-3.80317 0,-2.78268 -2.319758,-1.94911 -1.481838,-1.85367 z M 34.083453,266.88078 c 0.611189,0.41916 1.533099,0.71134 2.074889,0.47909 0.542183,-0.23067 1.703048,-1.07096 1.703048,-1.07096 0,0 -0.703458,-0.0887 -1.403763,0.17942 -0.70267,0.27207 -1.867478,0.0386 -2.374174,0.41245 z m 63.217849,33.68638 c -0.18533,-0.94202 -0.40023,-1.87616 -0.63879,-2.79886 -0.0446,-0.17389 -0.10173,-0.34502 -0.14826,-0.51734 -0.20189,-0.74013 -0.42468,-1.47631 -0.65811,-2.20186 -0.0939,-0.28272 -0.1873,-0.56466 -0.28746,-0.8458 -0.22555,-0.64983 -0.46608,-1.29139 -0.71608,-1.93018 -0.0982,-0.24802 -0.19164,-0.50117 -0.29495,-0.74683 -0.35212,-0.8466 -0.7212,-1.68412 -1.11985,-2.50509 -0.0804,-0.1664 -0.16956,-0.32728 -0.25197,-0.4921 -0.32728,-0.66166 -0.67073,-1.31347 -1.02995,-1.95699 -0.15812,-0.2843 -0.32058,-0.56663 -0.48738,-0.84699 -0.31269,-0.53745 -0.63879,-1.06781 -0.97277,-1.59067 -0.16916,-0.26971 -0.3399,-0.53863 -0.51498,-0.80519 -0.47042,-0.70662 -0.95661,-1.40455 -1.46251,-2.08593 -0.12579,-0.16956 -0.25631,-0.33399 -0.38525,-0.50039 -0.44715,-0.58358 -0.90496,-1.15652 -1.37537,-1.71764 -0.22555,-0.26616 -0.45228,-0.52562 -0.68178,-0.78705 -0.38406,-0.4373 -0.77404,-0.86789 -1.17545,-1.29178 -0.24172,-0.2563 -0.48264,-0.513 -0.72751,-0.76458 -0.49211,-0.49841 -0.99249,-0.98224 -1.50313,-1.45817 -0.21175,-0.19716 -0.41916,-0.39511 -0.63367,-0.58714 -0.58674,-0.52917 -1.18728,-1.04218 -1.79965,-1.54059 -0.27879,-0.22594 -0.56348,-0.44361 -0.84266,-0.66482 -0.4436,-0.34502 -0.89628,-0.68532 -1.35329,-1.01457 -0.30401,-0.21924 -0.60645,-0.43848 -0.91165,-0.64983 -0.51459,-0.35489 -1.04218,-0.69715 -1.57175,-1.03272 -0.24132,-0.15496 -0.48146,-0.31624 -0.72475,-0.46647 -0.73697,-0.44834 -1.48696,-0.87262 -2.25036,-1.28231 -0.31663,-0.16956 -0.63839,-0.32926 -0.96134,-0.49211 -0.50433,-0.25631 -1.01023,-0.50472 -1.52008,-0.74368 -0.35331,-0.16246 -0.70701,-0.32413 -1.05993,-0.47909 -0.54178,-0.23541 -1.09067,-0.4582 -1.64035,-0.67271 -0.24842,-0.097 -0.49565,-0.19991 -0.74407,-0.29376 -0.50946,0.33399 -3.49521,2.02442 -3.49521,2.02442 0,0 -3.06936,-0.53233 -3.91201,-0.53233 -0.84068,0 -4.13479,-0.58871 -4.88281,-0.68059 -0.74999,-0.095 -3.51019,-0.46608 -4.34575,0.37066 -0.84068,0.84028 -4.117442,1.69871 -4.869008,1.79216 -0.741707,0.095 -2.287424,0.49487 -0.433747,2.78229 -0.274444,0.28076 -5.563398,3.96682 -5.563398,2.28743 0,-1.67584 1.179004,-4.67461 -0.479093,-3.06778 -1.191228,1.15337 -3.082365,0.46648 -2.056356,1.77127 1.026009,1.30834 0.154966,0.94517 0,1.23894 -0.392344,0.74328 -0.629722,1.10329 -0.346998,3.24837 0.279176,2.14231 -3.425024,2.1293 -3.671866,1.57608 -0.661267,-1.48736 -2.235769,0.74052 -2.608397,1.30518 -0.37184,0.55835 -1.719216,2.03585 -1.719216,2.03585 l 1.545323,1.97986 -4.51373,3.95656 c 0,0 -6.276321,4.35404 -6.367802,4.91554 -0.09542,0.55756 -2.787417,7.77866 -1.855255,9.92335 0.932162,2.14507 3.288986,7.55942 5.520418,7.73923 2.92109,0.23816 10.01522,-1.33949 10.01522,-1.33949 0.188878,0.46884 1.438858,2.32054 1.438858,2.32054 0,0 3.565007,0.41601 3.75625,0.78864 0.06467,0.13249 -1.788616,3.73613 -0.648649,5.33114 2.472752,3.46327 4.837857,6.92813 3.477863,8.53536 -3.247189,4.87334 -0.140377,6.35202 0.648254,8.90601 0.28233,0.74722 1.205029,3.09064 2.628113,5.50267 1.422691,4.14268 2.334348,2.28742 4.203796,2.96959 2.3032,0.2011 4.24244,1.04651 6.19904,-1.46883 0.56702,-0.46292 1.53112,-0.0931 1.53112,-0.74407 0,-0.36908 1.66954,-1.43846 2.09658,-2.43923 0.45307,-0.20623 1.61314,-0.99368 2.40217,-1.36789 0.71371,-0.0461 -0.68177,-1.96369 0.7421,-3.99086 1.52758,-0.60055 5.65764,-3.38402 5.65764,-3.38402 0.18651,-4.07959 -2.01022,-9.12091 2.08711,-12.01282 2.64468,-2.68608 6.10716,-4.22115 7.78852,-8.32282 0.4653,-1.21015 1.50629,-3.68922 -1.48104,-2.94593 -2.80635,0.70701 -5.93682,0.86631 -4.45222,-0.36948 -0.16798,-1.51338 -2.04256,-2.22748 -3.7113,-3.71208 -0.86552,-2.04256 -2.2267,-5.68997 -2.2267,-5.68997 l -2.96762,-4.51137 0.37026,-0.92901 3.52558,5.1959 3.52518,4.2661 c 1.29848,4.26649 2.41006,4.63833 2.41006,4.63833 1.95344,-0.68689 6.58467,-2.59538 6.58467,-2.59538 l 4.54291,-4.36113 c 0,0 -0.46135,-1.38839 -2.31779,-3.15374 l -1.39075,-0.83555 c -0.30401,0.85409 -1.91676,1.17624 -1.91676,1.17624 l -1.04967,-1.5469 -1.38996,-1.57608 -1.48657,-1.57647 1.46015,-0.29653 1.12419,2.14232 2.70343,0.93571 c 0,0 0.74762,-0.54849 2.13561,0.88563 1.1305,-0.0911 3.52163,0.22752 3.52163,0.22752 0,0 2.02915,-0.009 3.06068,1.29888 0.19834,0.25473 0.4854,1.45818 0.86592,1.73262 1.29848,0.92664 2.38245,2.75351 3.3986,6.24438 0.59581,2.04256 1.20503,5.44156 2.24326,5.45772 0.45071,0.007 0.78469,0.18573 0.63288,-0.61119 -0.18415,-0.37105 -0.46372,-4.28818 -0.46372,-4.28818 0,0 0.46372,-4.35009 0.74329,-6.12135 0.70622,-1.50392 0.82254,0.003 2.50548,2.87298 -0.007,-0.0457 -0.0142,-0.0919 -0.0237,-0.14116 z m -46.38176,-31.97821 c 0.37026,-1.09698 2.50667,-1.47119 2.50667,-1.47119 0,0 -0.61435,1.1309 -0.47082,1.71646 0.14275,0.58871 -0.97474,0.96449 -1.10329,2.34697 -0.11632,1.38207 -2.67307,0.57254 -2.886,0.0887 -0.20307,-0.48541 1.57924,-1.58318 1.95344,-2.68096 z m 9.1497,18.67006 c -1.5816,0 -6.33034,0.46923 -7.63474,-0.46293 -1.30558,-0.92861 -2.31976,0.095 -3.26059,1.02719 -0.61592,0.60804 -2.858396,-0.62104 -3.511777,-1.55321 -0.652987,-0.93255 -2.844198,-0.86315 -2.844198,-0.86315 l 0.49526,-2.65769 -6.307471,-0.30835 -3.587483,1.04887 -3.376524,0.10134 1.89232,-0.90495 2.350121,-0.55835 c 0,0 3.426208,-2.80989 4.452217,-3.649 0.86986,-0.70819 4.329584,-0.30796 4.329584,-0.30796 l 3.801991,2.74404 c 0,0 -0.840287,2.14548 -1.214492,2.6084 1.395482,-0.095 3.039382,-2.63087 3.039382,-2.63087 -2.968011,-2.72275 -2.845379,-3.649 -2.845379,-3.649 l 3.908459,2.74089 0.0355,0.0256 c 0,0 1.58081,3.72786 2.23931,3.72786 0.65062,0 1.48263,-2.56778 1.48263,-2.56778 l 1.11434,-0.2776 c 0.49565,1.17585 1.4219,3.83472 2.53268,3.21288 0.6388,-0.35331 1.69911,-0.0323 2.90887,0.43533 1.21449,0.46292 2.04255,-0.24842 3.0311,0.61789 -0.1246,3.83551 -2.37693,2.28821 -3.0311,2.10052 z m 2.48419,-6.41631 c -1.6372,-0.62104 -3.69395,-0.36947 -3.69395,-0.36947 -0.70661,0.65496 -3.44671,-0.082 -2.2196,-1.53704 1.22711,-1.45187 2.34854,-2.15494 2.92424,-0.96805 0.14866,0.48541 1.98617,1.2421 1.97671,0.21451 -0.0162,-1.03074 1.83987,-1.57608 2.11274,-0.80992 -0.99092,0.71134 0.0568,1.30163 0.79533,1.70186 2.07568,1.13051 3.07882,2.72315 -1.89547,1.76811 z m 10.38193,3.13402 c -0.90219,-0.7279 0.40772,-1.3521 -0.92467,-2.49246 -1.91401,-1.63563 -3.39703,-2.34066 -0.79415,-3.6632 3.20381,-0.40338 0.51695,1.02089 1.04809,1.87774 0.28509,0.45661 1.91007,1.98222 3.17306,3.85364 1.04967,1.55479 -1.60408,1.14825 -2.50233,0.42428 z M 27.20383,268.80346 c 1.026403,-0.0919 3.7042,-2.41636 5.102049,-1.94713 1.401792,0.46293 2.55201,-0.47594 3.8568,-1.31149 0.464504,-0.095 1.116307,0.18217 2.240895,-0.37736 1.119462,-0.55796 3.355231,-1.76811 3.913188,-1.76811 0.557956,0 2.420309,-0.0694 2.882841,-0.81308 0,0 1.389962,0.18572 2.226309,0.28036 1.15534,0.12578 5.80866,1.11473 7.01921,0.64865 0.66639,-0.25631 3.46248,-0.48265 5.85164,-0.63406 -0.10923,-0.0241 -0.22161,-0.0532 -0.33359,-0.0773 -0.32058,-0.0678 -0.64904,-0.12421 -0.97514,-0.18533 -0.50433,-0.095 -1.01024,-0.19203 -1.52088,-0.27129 -0.2216,-0.0339 -0.4436,-0.0595 -0.66679,-0.0919 -0.61749,-0.0872 -1.23618,-0.17271 -1.85841,-0.23541 -0.0217,-0.002 -0.0394,-0.002 -0.0595,-0.005 -1.60289,-0.16128 -3.2326,-0.24527 -4.8765,-0.24527 -0.33359,0 -0.66126,0.0178 -0.9917,0.0256 -0.61316,0.0126 -1.22632,0.0292 -1.83396,0.0647 -0.474364,0.0272 -0.944782,0.0658 -1.414807,0.10804 -0.530748,0.0454 -1.056371,0.10134 -1.581993,0.16601 -0.451886,0.0548 -0.904955,0.10489 -1.35408,0.17113 -0.86158,0.12894 -1.714484,0.27602 -2.559502,0.44992 -0.412849,0.0836 -0.817811,0.18887 -1.225927,0.28233 -0.535481,0.12421 -1.067807,0.25315 -1.595007,0.3951 -0.434535,0.11593 -0.863156,0.23738 -1.292172,0.36593 -0.535086,0.16127 -1.066229,0.33398 -1.593429,0.513 -0.372234,0.12579 -0.751171,0.24329 -1.121433,0.37894 -0.806375,0.29534 -1.603287,0.61473 -2.389158,0.95187 -0.38288,0.16443 -0.758663,0.3403 -1.1376,0.51301 -0.490135,0.22594 -0.975931,0.45662 -1.456208,0.69873 -0.380908,0.19006 -0.761817,0.38051 -1.135628,0.58082 -0.55638,0.29653 -1.103295,0.60961 -1.645479,0.92743 -0.231069,0.13368 -0.464898,0.26104 -0.692418,0.39826 0.206621,0.38407 0.864734,0.47239 2.218419,0.043 z" - style="fill:url(#radialGradient2866)" /></g> -<rect - y="-260.71799" - width="360" - height="360" - id="rect44" - x="0" - style="fill:none" /> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="goto.svg"> - <metadata - id="metadata22"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs20"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective24" /> - </defs> - <sodipodi:namedview - pagecolor="#676760" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.95686275" - inkscape:pageshadow="2" - inkscape:window-width="640" - inkscape:window-height="489" - id="namedview18" - showgrid="false" - inkscape:zoom="10.727273" - inkscape:cx="11" - inkscape:cy="11" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <switch - id="switch4"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <rect - fill="none" - height="22" - width="22" - id="rect12" /> - <path - d="M9.579,14.322h5.581V9.951l3.355,3.354C18.823,12.425,19,11.484,19,10.5C19,5.814,15.188,2,10.5,2 C5.813,2,2,5.814,2,10.5c0,4.374,3.324,7.986,7.579,8.447V14.322z M14.648,7.341c0,0,0.002-0.52,0.52-0.52h1.549 c0,0,0,0.518,0.52,0.518h0.056c0.156,0.333,0.291,0.677,0.396,1.034h-0.971l-0.857,0.859l-1.211-1.21V7.341L14.648,7.341z M6.37,16.754c-1.975-1.309-3.292-3.527-3.36-6.051c0.743,0.743,2.326,2.324,2.326,2.324s-0.518,0.519,0,1.035 c0.481,0.48,1.034,1.035,1.034,1.035V16.754z M7.922,12.512c0,0-0.201-0.203-0.517-0.518c-0.314-0.314-0.734-0.301-1.035,0 c-0.299,0.301-0.517,0.518-0.517,0.518l-1.035-1.036c0.257-0.255,0.276-0.748,0-1.023c-0.274-0.275-0.517-0.527-0.517-0.527 c-0.266-0.268-0.266-0.768,0-1.034c0.267-0.267,0.769-0.267,1.034,0L5.853,9.41v1.034c0,0.259,0.517,0.259,0.517,0V9.408 l1.035-1.552c0,0,0,0,0.517,0s1.035-0.517,1.035-1.035c0-0.518-0.518-1.033-1.035-1.033c-0.482,0-0.257,0-0.517,0 c-0.259,0-0.259-0.518,0-0.518c0.26,0,1.034,0,1.034,0s0-0.002,0.518,0.518c0.26,0.258,0.775,0.258,1.035,0 c0.258-0.259,0.258-0.777,0-1.035C9.966,4.727,9.115,3.877,8.514,3.275C9.147,3.1,9.812,2.999,10.5,2.999 c0.546,0,1.077,0.062,1.591,0.174L11.543,3.72v1.553l0.418,0.417c0.135,0.133,0.387,0.133,0.518,0 c0.135-0.133,0.135-0.384,0-0.517L12.326,5.02c-0.271-0.271,0-0.524,0-0.524s0.253-0.26,0.511,0 c0.259,0.261,0.517,0.521,0.517,0.521s-1.053,1.053-1.291,1.291c-0.238,0.24,0,0.518,0,0.518l0.518,0.517c0,0,0,0.515,0,1.032 c0,0.518,0.518,0.518,0.518,0.518s0.518,0,1.035,0c0.014,0,0.018-0.007,0.03-0.008v0.526h-0.03 c-0.518,0-1.035,0.517-1.035,1.034v1.552c0,0.494,0.553,1.032,1.035,1.032c0,0,0.021,0,0.03,0.002v0.295H9.934 c-0.132-0.403-0.566-0.812-0.977-0.812C8.471,12.512,7.922,12.512,7.922,12.512z" - fill="#FFFFFF" - id="path14" /> - <polygon - fill="#FFFFFF" - points="10.6,19.044 10.6,15.318 16.182,15.318 16.182,12.361 21,17.184 16.182,22 16.182,19.044 " - id="polygon16" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto_pushed.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto_pushed.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/goto_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="goto_pushed.svg"> - <metadata - id="metadata22"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs20"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective24" /> - <filter - id="filter2818" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix2820" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2822" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " - result="fbSourceGraphic" /> - <feColorMatrix - result="fbSourceGraphicAlpha" - in="fbSourceGraphic" - values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" - id="feColorMatrix2821" /> - <feColorMatrix - id="feColorMatrix2823" - type="saturate" - values="1" - result="fbSourceGraphic" - in="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2825" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " - result="fbSourceGraphic" /> - <feColorMatrix - result="fbSourceGraphicAlpha" - in="fbSourceGraphic" - values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" - id="feColorMatrix3615" /> - <feColorMatrix - id="feColorMatrix3617" - type="saturate" - values="1" - result="fbSourceGraphic" - in="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix3619" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - <filter - id="filter3609" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix3611" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix3613" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - </defs> - <sodipodi:namedview - pagecolor="#676760" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0.95686275" - inkscape:pageshadow="2" - inkscape:window-width="1133" - inkscape:window-height="863" - id="namedview18" - showgrid="false" - inkscape:zoom="10.727273" - inkscape:cx="-5.5466097" - inkscape:cy="11" - inkscape:window-x="0" - inkscape:window-y="176" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3609)" - d="M 0 0 L 0 22 L 16.1875 22 L 16.1875 19.03125 L 10.59375 19.03125 L 10.59375 15.3125 L 16.1875 15.3125 L 16.1875 12.375 L 21 17.1875 L 16.1875 22 L 22 22 L 22 0 L 0 0 z M 10.5 2 C 15.188 2 19 5.814 19 10.5 C 19 11.484 18.808 12.4325 18.5 13.3125 L 15.15625 9.9375 L 15.15625 14.3125 L 9.59375 14.3125 L 9.59375 18.9375 C 5.33875 18.4765 2 14.874 2 10.5 C 2 5.814 5.813 2 10.5 2 z M 10.5 3 C 9.812 3 9.133 3.10625 8.5 3.28125 C 9.101 3.88325 9.974 4.724 10 4.75 C 10.258 5.008 10.258 5.52225 10 5.78125 C 9.74 6.03925 9.22875 6.03925 8.96875 5.78125 C 8.45075 5.26125 8.4375 5.28125 8.4375 5.28125 L 7.40625 5.28125 C 7.14725 5.28125 7.14725 5.78125 7.40625 5.78125 L 7.9375 5.78125 C 8.4545 5.78125 8.96875 6.2945 8.96875 6.8125 C 8.96875 7.3305 8.4545 7.84375 7.9375 7.84375 L 7.40625 7.84375 L 6.375 9.40625 L 6.375 10.4375 C 6.375 10.6965 5.84375 10.6965 5.84375 10.4375 L 5.84375 9.40625 L 5.34375 8.90625 C 5.07875 8.63925 4.5795 8.63925 4.3125 8.90625 C 4.0465 9.17225 4.0465 9.6695 4.3125 9.9375 C 4.3125 9.9375 4.5385 10.1625 4.8125 10.4375 C 5.0885 10.7125 5.0695 11.21375 4.8125 11.46875 L 5.84375 12.5 C 5.84375 12.5 6.076 12.301 6.375 12 C 6.676 11.699 7.09225 11.686 7.40625 12 C 7.72225 12.315 7.9375 12.5 7.9375 12.5 C 7.9375 12.5 8.48275 12.498 8.96875 12.5 C 9.37975 12.5 9.8055 12.9095 9.9375 13.3125 L 14.15625 13.3125 L 14.15625 13.03125 C 14.14725 13.02925 14.125 13.03125 14.125 13.03125 C 13.643 13.03125 13.09375 12.494 13.09375 12 L 13.09375 10.4375 C 13.09375 9.9205 13.607 9.40625 14.125 9.40625 L 14.15625 9.40625 L 14.15625 8.875 C 14.14425 8.876 14.139 8.90625 14.125 8.90625 L 13.09375 8.90625 C 13.09375 8.90625 12.59375 8.893 12.59375 8.375 L 12.59375 7.34375 L 12.0625 6.8125 C 12.0625 6.8125 11.8245 6.5525 12.0625 6.3125 L 13.34375 5.03125 L 12.84375 4.5 C 12.58575 4.24 12.3125 4.5 12.3125 4.5 C 12.3125 4.5 12.0415 4.76025 12.3125 5.03125 L 12.46875 5.1875 C 12.60375 5.3205 12.60375 5.5545 12.46875 5.6875 C 12.33775 5.8205 12.10375 5.8205 11.96875 5.6875 L 11.53125 5.28125 L 11.53125 3.71875 L 12.09375 3.1875 C 11.57975 3.0755 11.046 3 10.5 3 z M 15.15625 6.8125 C 14.63825 6.8125 14.65625 7.34375 14.65625 7.34375 L 14.65625 8.03125 L 15.875 9.21875 L 16.71875 8.375 L 17.6875 8.375 C 17.5825 8.018 17.43725 7.67675 17.28125 7.34375 L 17.25 7.34375 C 16.73 7.34375 16.71875 6.8125 16.71875 6.8125 L 15.15625 6.8125 z M 3 10.6875 C 3.068 13.2115 4.4 15.441 6.375 16.75 L 6.375 15.09375 C 6.375 15.09375 5.82475 14.5425 5.34375 14.0625 C 4.82575 13.5465 5.34375 13.03125 5.34375 13.03125 L 3 10.6875 z " - id="rect2827" /> - <switch - id="switch4" - style="filter:url(#filter2818)"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <rect - height="22" - width="22" - id="rect12" - fill="none" /> - <g - id="g3601" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="reload.svg"> - <metadata - id="metadata20"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs18"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective22" /> - </defs> - <sodipodi:namedview - pagecolor="#464646" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="640" - inkscape:window-height="480" - id="namedview16" - showgrid="false" - inkscape:zoom="11.045455" - inkscape:cx="11" - inkscape:cy="11" - inkscape:window-x="404" - inkscape:window-y="385" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <switch - id="switch4"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <path - d="M6,10.696L6,10.696c0-2.767,2.252-5.019,5.019-5.019c1.579,0,2.988,0.734,3.908,1.877l1.899-1.899 C15.415,4.032,13.34,3,11.019,3C6.77,3,3.322,6.445,3.322,10.696l0,0H1l3.652,3.654l3.653-3.654H6z M21.001,10.677L17.35,7.025 l-3.651,3.652h2.34c0,0.006,0,0.012,0,0.019c0,2.767-2.25,5.019-5.019,5.019c-1.592,0-3.011-0.748-3.931-1.908l-1.9,1.901 c1.41,1.64,3.498,2.683,5.831,2.683c4.25,0,7.696-3.445,7.696-7.695c0-0.007-0.001-0.013-0.002-0.019H21.001z" - fill="#FFFFFF" - id="path12" /> - <rect - fill="none" - height="22" - width="22" - id="rect14" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload_pushed.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload_pushed.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/reload_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="reload_pushed.svg"> - <metadata - id="metadata20"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs18"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective22" /> - <filter - id="filter2817" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix2819" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2821" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - <filter - id="filter2823" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix2825" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2827" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - </defs> - <sodipodi:namedview - pagecolor="#464646" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="915" - inkscape:window-height="752" - id="namedview16" - showgrid="false" - inkscape:zoom="11.045455" - inkscape:cx="11" - inkscape:cy="11" - inkscape:window-x="184" - inkscape:window-y="265" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter2817)" - d="M 11 0 C 4.9248678 1.2247148e-15 5.3395523e-19 4.9248678 0 11 C 1.1564823e-18 17.075132 4.9248678 22 11 22 C 17.075132 22 22 17.075132 22 11 C 22 4.9248678 17.075132 -2.4519314e-15 11 0 z M 11.03125 3 C 13.35225 3 15.4015 4.03325 16.8125 5.65625 L 14.9375 7.5625 C 14.0175 6.4195 12.61025 5.6875 11.03125 5.6875 C 8.26425 5.6875 6 7.9205 6 10.6875 L 8.3125 10.6875 L 4.65625 14.34375 L 1 10.6875 L 3.3125 10.6875 C 3.3125 6.4365 6.78225 3 11.03125 3 z M 17.34375 7.03125 L 21 10.6875 L 18.71875 10.6875 C 18.71875 14.9375 15.28125 18.40625 11.03125 18.40625 C 8.69825 18.40625 6.5975 17.35875 5.1875 15.71875 L 7.09375 13.8125 C 8.01375 14.9725 9.43925 15.71875 11.03125 15.71875 C 13.80025 15.71875 16.03125 13.4545 16.03125 10.6875 L 13.6875 10.6875 L 17.34375 7.03125 z " - id="path2851" /> - <switch - id="switch4" - style="filter:url(#filter2823)"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <rect - fill="none" - height="22" - width="22" - id="rect14" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="stop.svg"> - <metadata - id="metadata20"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs18"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective22" /> - </defs> - <sodipodi:namedview - pagecolor="#303030" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="640" - inkscape:window-height="480" - id="namedview16" - showgrid="false" - inkscape:zoom="11.045455" - inkscape:cx="11" - inkscape:cy="11" - inkscape:window-x="328" - inkscape:window-y="337" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <switch - id="switch4"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <path - d="M13.807,11l4.965-4.966c0.357-0.407,0.403-0.97-0.041-1.415L17.38,3.271 c-0.442-0.447-1.007-0.4-1.414-0.041l-4.965,4.965L6.034,3.229C5.627,2.871,5.066,2.825,4.62,3.272L3.271,4.62 C2.825,5.065,2.872,5.627,3.229,6.034L8.196,11l-4.967,4.967c-0.357,0.406-0.403,0.969,0.042,1.412L4.62,18.73 c0.446,0.444,1.008,0.398,1.414,0.041l4.967-4.967l4.965,4.965c0.407,0.357,0.97,0.404,1.414-0.039l1.351-1.352 c0.444-0.443,0.398-1.006,0.041-1.414L13.807,11z" - fill="#FFFFFF" - id="path12" /> - <rect - fill="none" - height="22" - width="22" - id="rect14" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop_pushed.png Binary file ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop_pushed.svg --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/stop_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="22" - viewBox="0 0 22 22" - width="22" - id="svg2" - version="1.1" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="stop.svg"> - <metadata - id="metadata20"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs18"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 11 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="22 : 11 : 1" - inkscape:persp3d-origin="11 : 7.3333333 : 1" - id="perspective22" /> - <filter - id="filter2831" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix2833" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2835" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - <filter - id="filter2837" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"> - <feColorMatrix - id="feColorMatrix2839" - type="saturate" - values="1" - result="fbSourceGraphic" /> - <feColorMatrix - id="feColorMatrix2841" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /> - </filter> - </defs> - <sodipodi:namedview - pagecolor="#303030" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:window-width="900" - inkscape:window-height="801" - id="namedview16" - showgrid="false" - inkscape:zoom="11.045455" - inkscape:cx="11" - inkscape:cy="11" - inkscape:window-x="189" - inkscape:window-y="275" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <path - style="opacity:0.98999999000000005;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter2831)" - d="M 0 0 L 0 22 L 22 22 L 22 0 L 0 0 z M 5.34375 2.9375 C 5.590625 2.937875 5.82775 3.03975 6.03125 3.21875 L 11 8.1875 L 15.96875 3.21875 C 16.37575 2.85975 16.933 2.83425 17.375 3.28125 L 18.71875 4.625 C 19.16275 5.07 19.13825 5.62425 18.78125 6.03125 L 13.8125 11 L 18.78125 15.96875 C 19.13825 16.37675 19.16275 16.932 18.71875 17.375 L 17.375 18.71875 C 16.931 19.16175 16.37575 19.13825 15.96875 18.78125 L 11 13.8125 L 6.03125 18.78125 C 5.62525 19.13825 5.071 19.16275 4.625 18.71875 L 3.28125 17.375 C 2.83625 16.932 2.86175 16.37475 3.21875 15.96875 L 8.1875 11 L 3.21875 6.03125 C 2.86175 5.62425 2.83525 5.07 3.28125 4.625 L 4.625 3.28125 C 4.848 3.05775 5.096875 2.937125 5.34375 2.9375 z " - id="rect2828" /> - <switch - id="switch4" - style="filter:url(#filter2837)"> - <foreignObject - content="structured text" - height="1" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - width="1" - x="0" - y="0" - id="foreignObject6" /> - <g - id="g8"> - <g - id="g10"> - <rect - fill="none" - height="22" - width="22" - id="rect14" /> - </g> - </g> - </switch> -</svg> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/svg_favicon_convert.sh --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/svg_favicon_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=32 -ICON_HEIGHT=32 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/svg_urlsearch_convert.sh --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/icons/svg_urlsearch_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=32 -ICON_HEIGHT=32 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/urlsearch.css --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/urlsearch.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -#UrlSearchChromeId { - overflow: hidden; -// background: -webkit-gradient(linear, left top, left bottom, -// color-stop(0%,#333366), -// color-stop(100%,#9999aa)); - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%,#445b7c), - color-stop(100%,#303f57)); - padding-left: 3px; - padding-right: 3px; - -} - -#UrlSearchChromeId form { - display: block; - //padding-top: 5px; - } - -#PWrap { - // position: relative; - vertical-align: top; - -webkit-border-top-left-radius: 12px; - -webkit-border-top-right-radius: 12px; - -webkit-border-bottom-left-radius: 12px; - -webkit-border-bottom-right-radius: 12px; - height: 36px; -} - -#favicon { - width: 32px; - height: 32px; - padding-top: 2px; - position: relative; -} - -#urlBox { - margin-left: 2px; - width: 100%; - height: 36px; - -webkit-border-top-left-radius: 12px; - -webkit-border-top-right-radius: 12px; - -webkit-border-bottom-left-radius: 12px; - -webkit-border-bottom-right-radius: 12px; - position: absolute: - top: 0px; - left: 0px; - font-size: 24px; -} - -#PBar { - overflow: hidden; - -moz-opacity: .55; - opacity: .55; - position: relative; - top: -36px; - left: 2px; - height: 36px; - background-color: #B0C4DE; - z-index: 200; - -webkit-border-top-left-radius: 12px; - -webkit-border-top-right-radius: 12px; - -webkit-border-bottom-left-radius: 12px; - -webkit-border-bottom-right-radius: 12px; -} - -#UrlSearchChromeId table { - width: 100%; - height: 100%; - border: 0; - border-spacing: 0; - padding: 0; -} - -#UrlSearchChromeId tr { - font-family: Verdana; - font-size: 16px; - color: #A9A9A9; - overflow: hidden; - vertical-align: middle; -} - -#UrlSearchChromeId td { - border-spacing: 0; - padding: 0; -} - - -#tristateBtn { - text-align: center; - height: 32px; - width: 32px; - -webkit-user-drag: none; - -webkit-user-select: none; -} - -#faviconCell { - text-align: center; - width: 40px; - } - -#tristateBtnCell { - text-align: center; - width: 55px; - vertical-align: center; -} - - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/urlsearch.snippet/urlsearch.js --- a/ginebra/chrome/bedrockchrome/urlsearch.snippet/urlsearch.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,567 +0,0 @@ -/*! - \file urlsearch.js This module contains the UrlSearch class. -*/ - -var enumObj = new Object(); -enumObj.state = {Loading:0, Editing:1, Reloadable:2} - -/* The following "classes" are psudo classes since javascript doesn't have - true classes. The prototype object is a property of all JavaScript - objects and can be used to impart properties to each instance of a - class - these properties become public and can't access private class - members. Another way to create a public method is to add code like the - following inside of the class constructor. - - // create a public method named clearPBar - this.clearPBar = function() - { - } - - Methods created this way can access private members. Syntax-wise, - private member variables and methods are created in the usual fasion but - within the class constructor. Semantically they are simulated in JavaScript - using closures. -*/ - -/*! - Class to handle displaying and updating the URL search bar. Only 1 search - bar should be created for the browser. This class is not designed to be code - space efficient for creating multiple URL search bar objects. -*/ -function UrlSearch(lastUrl) -{ - /*! - Class to handle displaying and updating the URL text box. - */ - function UrlTextBox() - { - } - - //! UrlTextBox Public Methods - - UrlTextBox.prototype.getTextBoxValue = function() - { - return document.gotoUrlForm.textBox.value; - } - - UrlTextBox.prototype.setTextBoxValue = function(text) - { - //window.chrome.alert("setTextBoxValue" + text); - document.gotoUrlForm.textBox.value = text; - } - - // Unused Method - UrlTextBox.prototype.textBoxFocus = function() - { - document.gotoUrlForm.textBox.focus(); - } - - UrlTextBox.prototype.hasFocus = function() - { - return document.getElementById("urlBox").hasFocus; - } - - UrlTextBox.prototype.setFocus = function(hasFocus) - { - document.getElementById("urlBox").hasFocus = hasFocus; - } - - /*! - Class to handle displaying and updating the URL tri-state button. - */ - function UrlTriStateButton() - { - } - - //! UrlTriStateButton Public Methods - UrlTriStateButton.prototype.setButton = function() - { - //window.chrome.alert("setButton " + window.pageController.loadState); - btnDom = document.getElementById("tristateBtn").button; - switch (window.pageController.loadState) { - case enumObj.state.Loading: - btnDom.updateImages("urlsearch.snippet/icons/stop.png", - "urlsearch.snippet/icons/stop_pushed.png", - "urlsearch.snippet/icons/stop.png"); - break; - case enumObj.state.Editing: - btnDom.updateImages("urlsearch.snippet/icons/goto.png", - "urlsearch.snippet/icons/goto_pushed.png", - "urlsearch.snippet/icons/goto.png"); - break; - case enumObj.state.Reloadable: - btnDom.updateImages("urlsearch.snippet/icons/reload.png", - "urlsearch.snippet/icons/reload_pushed.png", - "urlsearch.snippet/icons/reload.png"); - break; - default: - window.chrome.alert("Incorrect state"); - break; - } - - document.getElementById("tristateBtn").button.updateButton(); - } - - // Unused Method - UrlTriStateButton.prototype.changeTriState = function(a) - { - if (this.getValue() != a) { - this.setValue(a); - /* Shouln't have to do this check. This function should be - * called only after chrome has completed loading which - * means that all snippets have also been created. - */ - if (window.snippets.UrlSearchChromeId) { - window.snippets.UrlSearchChromeId.repaint(); - } - } - } - - /*! - Class to handle displaying and updating the URL progress bar. - */ - function UrlProgressBar() - { - this.oldpercent = 0; - } - - //! UrlProgressBar Public Methods - - UrlProgressBar.prototype.setProgress = function(widthStr) - { - document.getElementById("PBar").style.width = widthStr; - } - - UrlProgressBar.prototype.handlePageLoadProgress = function(percent) - { - //window.chrome.alert("Load prog "+percent); - if ((window.viewManager.currentView.type == "webView") && - (this.oldpercent != percent)) { - this.oldpercent = percent; - //window.chrome.alert("Load prog "+percent); - var parentWidth = document.getElementById("PWrap").offsetWidth; - this.setProgress((parentWidth * percent)/100 + "px"); - } - } - - UrlProgressBar.prototype.updateProgress = function(percent) - { - if (percent != 100) { - //window.chrome.alert("Load prog "+percent); - var parentWidth = document.getElementById("PWrap").offsetWidth; - this.setProgress((parentWidth * percent)/100 + "px"); - } else { - //clearProgressBar(); - this.setProgress("0%"); - oldpercent = 0; - } - } - - // UrlSearch Private Member Variables - var animator; - var animating = false; - var defaultPos; - var defaultHeight; - var animateDuration = 500; - var __blockDeselect = false; - var urlBarTextBox = new UrlTextBox(); - var urlBarButton = new UrlTriStateButton(); - var urlBarProgressBar = new UrlProgressBar(); - var searchSuggestEngine = new SearchSuggest(); - // UrlSearch Private Methods - - function _urlsearch_write(lastUrl) { - var html = ''+ - '<form name = "gotoUrlForm">' + - '<table id="UrlSearchTable">' + - '<tr>' + - '<td id="faviconCell"><img id = "favicon" src="urlsearch.snippet/icons/defaultFavicon.png"></td>'+ - '<td>' + - '<div id="PWrap">' + - '<input type ="text" id = "urlBox" name = "textBox" value="' + lastUrl + '" ' + - 'maxlength="256" '+ - 'OnFocus="urlsearch.focusElement(this,event)" '+ - 'OnMouseUp="return urlsearch.mouseUpElement(this,event)" '+ - 'OnMouseDown="urlsearch.mouseDownElement(this,event)" '+ - 'OnKeyUp="urlsearch.resetTriState();urlsearch.querySuggests();"/>' + - '<div id="PBar"></div>' + - '</div>' + - '</td>' + - '<td id="tristateBtnCell"' + - '<img id="tristateBtn">' + - '</td>' + - '</tr>' + - '</table>' + - '</form>'; - - document.write(html); - } - - function loadToMainWindow(gotourl){ - // use a single call to guess url and goto url - // (could do as separate calls, but we try to eliminate lag with a single call) - - //var correctedUrl = window.chrome.guessAndGotoUrl(gotourl); - //urlBarTextBox.setTextBoxValue(correctedUrl); - - var gotourl = window.chrome.guessUrlFromString(gotourl); - window.pageController.currentLoad(gotourl); - urlBarTextBox.setTextBoxValue(gotourl); - window.pageController.urlTextChanged(gotourl); - } - - function loadSearchUrl(gotourl){ - var gotourl = window.chrome.searchUrl(gotourl); - window.pageController.currentLoad(gotourl); - urlBarTextBox.setTextBoxValue(gotourl); - window.pageController.urlTextChanged(gotourl); - } - - function chromeAlert(){ - window.chrome.alert("chrome Alert!"); - } - - function canSeeUrl() - { - return (!window.snippets.UrlSearchChromeId.isHiding && window.snippets.UrlSearchChromeId.isVisible()); - } - - function showUrlBar() - { - if (!canSeeUrl()) { - //window.chrome.alert("showUrlbar"); - window.snippets.UrlSearchChromeId.zValue = window.snippets.StatusBarChromeId.zValue - 1; - window.snippets.UrlSearchChromeId.setPosition(0,defaultPos); - window.snippets.UrlSearchChromeId.show(false); - window.chrome.updateViewPort(); - } - } - - function hideUrlBar() - { - //window.chrome.alert("hideUrlbar"); - if (canSeeUrl()) { - window.snippets.UrlSearchChromeId.hide(false); - } - } - - function slideUrlOut() { - //window.chrome.alert("slideUrlOut"); - if (canSeeUrl()) { - window.snippets.UrlSearchChromeId.zValue = window.snippets.StatusBarChromeId.zValue - 1; - animating = true; - //window.snippets.UrlSearchChromeId.isHiding = true; - animator = window.snippets.UrlSearchChromeId.animate(animateDuration).translateBy(0, -1 * defaultHeight).start(); - animator.updated.connect(animationUpdated); - animator.finished.connect(hideAnimationFinished); - } - } - - function slideUrlIn() - { - /* show it at right position and zorder first */ - window.snippets.UrlSearchChromeId.zValue = window.snippets.StatusBarChromeId.zValue - 1; - window.snippets.UrlSearchChromeId.setPosition(0, defaultPos-defaultHeight); - window.snippets.UrlSearchChromeId.show(false); - //window.snippets.UrlSearchChromeId.isHiding = false; - - animating = true; - animator = window.snippets.UrlSearchChromeId.animate(animateDuration).translateBy(0, defaultHeight).start(); - animator.updated.connect(animationUpdated); - animator.finished.connect(showAnimationFinished); - } - - function setUrlSearchValues() - { - //window.chrome.alert("setUrlSearchValues " + window.pageController.loadText); - urlBarTextBox.setTextBoxValue(window.pageController.loadText); - urlBarButton.setButton(); - - //window.chrome.alert("setProgress " + "New: " + window.pageController.loadProgressValue + " Old Value: " + oldpercent ); - var percent = window.pageController.loadProgressValue; - - urlBarProgressBar.updateProgress(percent); - if (percent == 100) { - __blockDeselect = false; - urlBarTextBox.setFocus(false); - } - window.snippets.UrlSearchChromeId.repaint(); - } - - function animationUpdated(value) - { - window.chrome.updateViewPort(); - } - - function hideAnimationFinished() - { - //window.chrome.alert("hideAnimationFinished"); - animating = false; - window.snippets.UrlSearchChromeId.isHiding = true; - } - - function showAnimationFinished() - { - //window.chrome.alert("showAnimationFinished"); - animating = false; - window.snippets.UrlSearchChromeId.isHiding = false; - } - - // Public Methods - this.focusElement = function(el, event) - { - el.select(); - __blockDeselect = true; - document.getElementById("urlBox").scrollLeft = 1000; - urlBarTextBox.setFocus(true); - } - - this.mouseDownElement = function(el, event) - { - // Clear __justSelected in case the element gained focus through some non-mouse event - // and still has focus. - __blockDeselect = false; - } - - this.mouseUpElement = function(el, event) - { - // Return false to prevent Qt from deselecting the text if we've just selected it - // in focusElement(), return true otherwise. - - var result = !__blockDeselect; - __blockDeselect = false; - return result; - } - - this.clearPBar = function() - { - urlBarProgressBar.setProgress("0%"); - } - - this.pushTriState = function() - { - //window.chrome.alert("pushTriState " + window.pageController.loadState); - switch (window.pageController.loadState) { - case enumObj.state.Loading: - //window.chrome.alert("In loading state, stop loading"); - window.pageController.currentStop(); - setTimeout("urlsearch.clearPBar()", 50); - break; - case enumObj.state.Editing: - //window.chrome.alert("In editing state, start loading"); - loadToMainWindow(urlBarTextBox.getTextBoxValue()); - break; - case enumObj.state.Reloadable: - //window.chrome.alert("In reloadable state, start reloading"); - window.pageController.currentReload(); - break; - default: - window.chrome.alert("Incorrect state"); - break; - } - urlBarButton.setButton(); - - } - - this.resetTriState = function() - { - if(window.pageController.loadState == enumObj.state.Reloadable) { - urlBarTextBox.setFocus(true); - //window.chrome.alert("Change to editing"); - window.pageController.setLoadState(enumObj.state.Editing); - urlBarButton.setButton(); - } - } - - this.querySuggests = function() - { - /* Disable suggests - var text = urlBarTextBox.getTextBoxValue(); - //window.chrome.alert("call searchSuggest " + text); - searchSuggests.removeAllItems(); - searchSuggests.hideSuggests(); - searchSuggestEngine.searchSuggest(text, this.updateSuggests); - */ - } - - this.updateSuggests = function(result) - { - var curText = urlBarTextBox.getTextBoxValue(); - searchSuggests.removeAllItems(); - if (result.length > 1 && curText == result[0]){ - for(var i = 1; i < result.length; i++) { - //window.chrome.alert(result[i]); - searchSuggests.addItem(result[i]); - } - searchSuggests.showSuggests(); - } - - - - } - - // UrlSearch Constructor - - // do setup - _urlsearch_write(lastUrl); - - - // Init the button - new SimpleButton("tristateBtn", - "urlsearch.snippet/icons/goto.png", - "urlsearch.snippet/icons/goto_pushed.png", - "urlsearch.snippet/icons/goto.png", - this.pushTriState); - urlBarButton.setButton(); - - // Note that in the slots below the "this" object is never used directly. - // This is because they don't have access to "this" as they are called - // externaly. - - // Connect Chrome load complete signal to slot. - window.chrome.loadComplete.connect( - function () { - defaultPos = window.snippets.UrlSearchChromeId.anchorOffset; - defaultHeight = UrlSearchChromeId.offsetHeight; - } - ); - - // Connect various Page Controller signals to slots. - window.pageController.pageUrlChanged.connect( - function(url) { - //window.chrome.alert(url); - //url is coming from loadContoller. So need not set it back - urlBarTextBox.setTextBoxValue(url); - } - ); - - window.pageController.pageLoadStarted.connect( - function() { - //window.chrome.alert("Load start"); - urlBarProgressBar.setProgress("5%"); - urlBarButton.setButton(); - - /* show url bar if it's hiding in contentView */ - if (window.viewManager.currentView.type == "webView") { - if (window.snippets.UrlSearchChromeId) { - showUrlBar(); - } - } - } - ); - - window.pageController.pageLoadProgress.connect( - function(percent) { - urlBarProgressBar.handlePageLoadProgress(percent); - } - ); - - window.pageController.pageLoadFinished.connect( - function(ok) { - //window.chrome.alert("pageLoadFinished: "); - // If the load was finished normally and not due to user stopping it, - // simulate progress completion - if(!window.pageController.loadCanceled) { - urlBarProgressBar.setProgress("99%"); - } - setTimeout("urlsearch.clearPBar()", 500); - __blockDeselect = false; - urlBarTextBox.setFocus(false); - urlBarButton.setButton(); - - /* start hide animation if contentYpos is not zero */ - if (window.viewManager.currentView.type == "webView") { - if (window.snippets.UrlSearchChromeId && window.pageController.contentsYPos > 0) { - slideUrlOut(); - } - } - } - ); - - window.pageController.pageIconChanged.connect( - function() { - window.chrome.alert("FAVICON changed"); - } - ); - - window.pageController.pageCreated.connect( - function() { - //window.chrome.alert("add new window"); - showUrlBar(); - } - ); - - window.pageController.pageChanged.connect( - function() { - - //window.chrome.alert("Page changed"); - // Set the values of the new page - setUrlSearchValues(); - } - ); - - window.pageController.pageScrollPositionZero.connect( - function() { - var contentYPos = window.pageController.contentsYPos; - //window.chrome.alert("pageScrollRequested contentYPos = " + contentYPos); - if (contentYPos > 0) { - if(canSeeUrl() && !animating && !pageController.isPageLoading) { - slideUrlOut(); - //window.chrome.updateViewPort(); - } - } - else { - if(!canSeeUrl() && !animating) { - slideUrlIn(); - } - } - } - ); - - // Connect snippets CR signal to slot. - window.snippets.symbianCarriageReturn.connect( - function() { - if (urlBarTextBox.hasFocus()) { - // When we get load started, the button will be changed - loadToMainWindow(urlBarTextBox.getTextBoxValue()); - } - } - ); - - // Connect View Manager current view changed signal to slot. - window.viewManager.currentViewChanged.connect( - function() { - if (window.viewManager.currentView.type == "webView") { - /*window.chrome.alert("currentViewChanged window.viewManager.currentView.type =" + window.viewManager.currentView.type + "Pos " + window.pageController.contentsYPos == 0 + "Loading still: " + pageController.isPageLoading);*/ - // When we change back to content view, show the urlsearch bar if either we are - // at the top or we are still loading the page (in this case, we will hide the urlsearch bar - // if needed on getting loadFinished - if (window.pageController.contentsYPos == 0 || pageController.isPageLoading) { - // show url bar with no animation - showUrlBar(); - } - //set the correct values based on the window - //window.chrome.alert("currentViewChanged " + window.pageController.loadText); - setUrlSearchValues(); - - // place focus in urlsearch bar when returning from adding a new window in windows view - if (window.pageController.loadText == "") { - __blockDeselect = false; - document.getElementById("urlBox").focus(); - return; - } - } else { - //Save url text box value - window.pageController.urlTextChanged(urlBarTextBox.getTextBoxValue()); - - // Remove progress bar and url text field value so that - // incorrect values are not seen before we can update when we come back - urlBarTextBox.setTextBoxValue(""); - urlBarProgressBar.setProgress("0%"); - hideUrlBar(); - } - - } - ); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/icons/emptycircle.png Binary file ginebra/chrome/bedrockchrome/windowcount.snippet/icons/emptycircle.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/icons/emptycircle.svg --- a/ginebra/chrome/bedrockchrome/windowcount.snippet/icons/emptycircle.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2494 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - baseProfile="basic" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docname="emptycircle.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\011010\Bedrock\app\browser\ginebra\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png" - inkscape:export-xdpi="9.4559669" - inkscape:export-ydpi="9.4559669"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4061374,0,0,1.6159386,-15.729605,-34.385428)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1680" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="11.021438" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="20" - inkscape:current-layer="g4046" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><path - sodipodi:type="arc" - style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e50d19;stroke-width:3.08376765000000000;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3461" - sodipodi:cx="55.952381" - sodipodi:cy="54.437229" - sodipodi:rx="34.740261" - sodipodi:ry="26.948051" - d="M 90.657893,55.642245 A 34.740261,26.948051 0 1 1 90.692503,54.513586" - transform="matrix(0.8889622,0,0,1.1408516,-4.8829996,-11.989394)" - sodipodi:start="0.04473117" - sodipodi:end="6.2860188" - sodipodi:open="true" - inkscape:export-xdpi="18.000523" - inkscape:export-ydpi="18.000523" - inkscape:export-filename="Y:\iSource\bedrock\qt46\011010\Bedrock\app\browser\ginebra\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> -<i:pgf - id="adobe_illustrator_pgf"> - - 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 -O2yx0FivKlm3ftkK2V/9wjz+uQKwW2Wje7lyrLfMdQscdyuEeDWUvc6et0a192F1vc15+XoMfn26 -vy43YJdFcCPlYMtP2GUyXKY97HAkdtkUexx+a/KG8K/DDLhGIlg4AFfIkV4W436dSanLubSRn2nO -5dRlfdpAEdXwSXWZp5ZoqrqcVgvsV5upslperR4D1xJdV5fbq8sCtkQZ1uUX6zKRLdGWdTjOWjI0 -VZ4ra1qTQFfp1fSxLgvbJsq2Gb9bhwluiTauxzHXI6Pbgriu6X2HDm+FOa9J9OiS7HW4+Day9jUM -fz0uwCXiwHWWwS4f4RbkhTOmww4n4gKBYpdtsc/LuJnEccb42OWGXCKS7LNO3s1PuURm2TJf9jgy -lwg1O+ybXZ7OJVLPHgNolyt0I69ow0HaIytd5jVdp0DtcqVuQ6zasLB2+Vo3kbvOmGC7nLFLBLNd -NtoOb22Pu4/lXaK/LiXgOn/gFux/AdLnf7h99afX16/eXr/66fRU5MQK2P7Lr3/1h1/o38zA//jd -9//x7Pomf+rXv/q38veTf8//9dfff/uH2xdX9Pcn15dvr29fXbz+sOGfvjn57T9e3rzK/3iaG/j6 -+od3b6/e/MvJv+YHH71+fbH6zOXP1zcvXl+9oifsyb/97tXb+o/4n7cffrmif/ytGYbf/MvJv/3X -q+vLLP8uf/vVT/Nn31/cvJOHf766/unnt3c/Dm5Eejq3R5//10Po3N+vX7z9efu+yeP76toOHfvH -9p36x0F06MP2Hfqwvw49+t3zRze//Hzx3GzdsesX+dFNXcJD++rT7Q//5+ry7ePbd69e5DY+vt2w -tJqu/UgnYH727ZvtZ2/20r9u17H7dsC+fff6h3c3V68ur7YeK35520EqP7W37m3dsddXb97d7HB/ -6PP76pzdumev3r384+Xbi/dXO6zu9p199fDV7Xdvr99ebrj3mo6+ocf/cn2zS09nL+3tgskW1dbd -/OHizdWz11f/913euDtcNyuvbXlkLfXH3NWf/kXRnrhXf2mPng1Nv3tW7v/Rcv1qw2adXaF4eF/r -8Lvbd68vr/7j9cUvP19f7tC/Xbq3v95tamfTpdtfrl5fvL19vX3H6ht73lnnty9/uX1z/Xa7jfWZ -WkHK0eYG/NuTqx9PvjnaoUc79LPcqkc79FDsUH+0Q79iO/TH1xfZ2Lj5w+31m6Mleg== - - - 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 -f//zX373Xz/8+N8nT/6v8Dl+t/y/3/8/n8y//2fF7/9a/36O3+vj/+f/wu+n6/P/4//7vzGanz9+ -9PoRn6BGi4BA8t2T//7FrLRfhJdxv3sSR9+e/eUpgnh/OngZH6OX8YtQtXeLFrhKfP4P54+ev/rL -i/Nnt6IjF1e7qm6cR+r1OPebR6/7Izx/tRmKffbib2cPHn7zehbrrH7S4xfPhgKbFe25Fu+ftg6W -9HtKg2nAl0+ef/PiyfPXu7f71+XtJD5/8frR67OH3/bd7ZE9obPrPP/p2cmLl0/Oth7w1emjp2f3 -nzw/m4/WlSj/14e/eXTaR3TvTb4+++v52ThtmrZO/Obs/PTMnnrzog+WF90+8cHGiQeFL4XPPMDR -yYvz52fnr+A+vHx951p//3rceJJbWZNbV7yyzbKejn2y//TqennSw/512L/ueP/6+LXSdz88evzi -54P5+TEu348sdKT/vQ8eQG2bX5+/eHk01svlm+bi0IvhJBvXu+qWmceO+eenP5lJd1xmiNyLl49O -Lx2/t6cieHX69HzDJj19dX46jF09xd/OzmX6pXl/f/zo/MdN6/nloyeb1/nz0+ePN6/zw4vz//5Q -+A3fsxr/f7r80U9PX/+/16Ku+XY9LS7movr/uXvP7mRyrUH0fj5r+T8YsMmhqsg5Z2wwyeAAJhkw -0YTu0/NhfvtIqqQqKhGeuT3v6XX8AKXSlrZ21t6SZFWA7FE2j8lisJ9dj5O7AwK8Rz954U/95826 -tgMvzNdTh4P5PTUBbFEDTgPwx+jR1IY0APif+b0OniPzE2DgE65aZw+nK/z57j+1kWBq5tfZ/DAR -/I4oH+AdKB3ud5KtNzenn7rl+/pkjL0ieNSdLJeATemnpPgpneDNPyTwh+l/BvwzUvgstTxOsNEI -nj0NpsCFGrCPnSRztAjMAqFbRcFPT1HofXWjQeK+DD7y40cNA162xygBmgZhS/BbOYo3hBmQQWHD -AOpS3NDLzxq18sJWELywmdt7Chn8JobsJFDFBhwn0xDOhpsL347C0R2lCKaVCLDTK2jmlWvmF7bz -e2XaoavCSDonlGkboNHNNebRjZDtZvAIPtDtg2jmHCrdokEw/4jG4RciCV3Eh4r/uKYBgh2GR9jW -j0rZeCqK+lFLiHqJueEN0czQcuINSXZCBA8czvwJzqcb9QqakkwNDvyDN6XJk4KNKS+OABIfKE/I -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 -Y5PT0RVBqFPV4dWrtx/+0dj6L4/kVoE= - -</i:pgf> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/icons/filledcircle.png Binary file ginebra/chrome/bedrockchrome/windowcount.snippet/icons/filledcircle.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/icons/filledcircle.svg --- a/ginebra/chrome/bedrockchrome/windowcount.snippet/icons/filledcircle.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2494 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - baseProfile="basic" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docname="filledcircle.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="Y:\iSource\bedrock\qt46\011010\Bedrock\app\browser\ginebra\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png" - inkscape:export-xdpi="9.4559669" - inkscape:export-ydpi="9.4559669"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><linearGradient - gradientTransform="matrix(0,-0.6459372,-0.6459182,0,588.96893,-382.16033)" - y2="735.20758" - x2="-700.45172" - y1="735.20758" - x1="-661.64758" - gradientUnits="userSpaceOnUse" - id="path4348_1_"> - <stop - id="stop6905" - style="stop-color:#A7BCE1" - offset="0" /> - <stop - id="stop6907" - style="stop-color:#5278B2" - offset="1" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0" /> - <a:midPointStop - style="stop-color:#A7BCE1" - offset="0.5" /> - <a:midPointStop - style="stop-color:#5278B2" - offset="1" /> - </linearGradient><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /> - <foreignObject - id="foreignObject50038" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - -<linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient3939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient3941" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /> - - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)" - y2="-143.17619" - x2="167.39751" - y1="-134.248" - x1="167.39751" - gradientUnits="userSpaceOnUse" - id="path2262_3_"> - <stop - id="stop50098" - style="stop-color:#F79420" - offset="0" /> - <stop - id="stop50100" - style="stop-color:#A16427" - offset="0.9831" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0" /> - <a:midPointStop - style="stop-color:#F79420" - offset="0.5" /> - <a:midPointStop - style="stop-color:#A16427" - offset="0.9831" /> - </linearGradient> - - <linearGradient - y2="55.5" - x2="24.5" - y1="95.5" - x1="24.5" - gradientUnits="userSpaceOnUse" - id="path3267_2_"> - <stop - id="stop50104" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop50106" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - r="13.6992" - cy="79.8358" - cx="23.976801" - id="path2982_1_"> - <stop - id="stop50079" - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <stop - id="stop50081" - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <stop - id="stop50083" - style="stop-color:#214B88" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF;stop-opacity:0" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88;stop-opacity:0.0888" - offset="0.5" /> - <a:midPointStop - style="stop-color:#214B88" - offset="1" /> - </radialGradient> - - - - - - - - <linearGradient - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)" - y2="797.60358" - x2="-64.638603" - y1="783.00092" - x1="-63.846401" - gradientUnits="userSpaceOnUse" - id="path1995_1_"> - <stop - id="stop50089" - style="stop-color:#EEEEED" - offset="0" /> - <stop - id="stop50091" - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEED" - offset="0.5" /> - <a:midPointStop - style="stop-color:#EEEEED;stop-opacity:0" - offset="1" /> - </linearGradient> - - - - - - - <linearGradient - inkscape:collect="always" - xlink:href="#path3267_2_" - id="linearGradient4650" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4061374,0,0,1.6159386,-15.729605,-34.385428)" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5" /><linearGradient - inkscape:collect="always" - xlink:href="#path1995_1_" - id="linearGradient4654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.51188,-604.89341)" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" /></defs><sodipodi:namedview - inkscape:window-height="1003" - inkscape:window-width="1680" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="4.62" - inkscape:cx="42.83962" - inkscape:cy="32.467532" - inkscape:window-x="0" - inkscape:window-y="20" - inkscape:current-layer="g4046" /> -<symbol - id="minus" - viewBox="-20 -7 40 14" - transform="translate(-1.2987013,-3.6796537)"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="M 19.5,6.5 L 19.5,-6.5 L -19.5,-6.5 L -19.5,6.5 L 19.5,6.5 z" - style="fill:url(#linearGradient3939);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="M -18.5,5.5 L -18.5,-5.5 L 18.5,-5.5 L 18.5,5.5 L -18.5,5.5 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient3941)" /> - </symbol><g - id="g4046" - transform="matrix(1.5481836,0,0,1.548138,-19.662522,-27.585575)"><path - sodipodi:type="arc" - style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.63106203000000005;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3461" - sodipodi:cx="55.952381" - sodipodi:cy="54.437229" - sodipodi:rx="34.740261" - sodipodi:ry="26.948051" - d="M 90.657893,55.642245 A 34.740261,26.948051 0 1 1 90.692503,54.513586" - transform="matrix(0.9213835,0,0,1.1904307,-6.4873219,-14.688347)" - sodipodi:start="0.04473117" - sodipodi:end="6.2860188" - sodipodi:open="true" - inkscape:export-xdpi="8.9683628" - inkscape:export-ydpi="8.9683628" - inkscape:export-filename="Y:\iSource\bedrock\qt46\011010\Bedrock\app\browser\ginebra\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png" /></g><use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.107616,43.976571)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> -<i:pgf - id="adobe_illustrator_pgf"> - - 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 -O2yx0FivKlm3ftkK2V/9wjz+uQKwW2Wje7lyrLfMdQscdyuEeDWUvc6et0a192F1vc15+XoMfn26 -vy43YJdFcCPlYMtP2GUyXKY97HAkdtkUexx+a/KG8K/DDLhGIlg4AFfIkV4W436dSanLubSRn2nO -5dRlfdpAEdXwSXWZp5ZoqrqcVgvsV5upslperR4D1xJdV5fbq8sCtkQZ1uUX6zKRLdGWdTjOWjI0 -VZ4ra1qTQFfp1fSxLgvbJsq2Gb9bhwluiTauxzHXI6Pbgriu6X2HDm+FOa9J9OiS7HW4+Day9jUM -fz0uwCXiwHWWwS4f4RbkhTOmww4n4gKBYpdtsc/LuJnEccb42OWGXCKS7LNO3s1PuURm2TJf9jgy -lwg1O+ybXZ7OJVLPHgNolyt0I69ow0HaIytd5jVdp0DtcqVuQ6zasLB2+Vo3kbvOmGC7nLFLBLNd -NtoOb22Pu4/lXaK/LiXgOn/gFux/AdLnf7h99afX16/eXr/66fRU5MQK2P7Lr3/1h1/o38zA//jd -9//x7Pomf+rXv/q38veTf8//9dfff/uH2xdX9Pcn15dvr29fXbz+sOGfvjn57T9e3rzK/3iaG/j6 -+od3b6/e/MvJv+YHH71+fbH6zOXP1zcvXl+9oifsyb/97tXb+o/4n7cffrmif/ytGYbf/MvJv/3X -q+vLLP8uf/vVT/Nn31/cvJOHf766/unnt3c/Dm5Eejq3R5//10Po3N+vX7z9efu+yeP76toOHfvH -9p36x0F06MP2Hfqwvw49+t3zRze//Hzx3GzdsesX+dFNXcJD++rT7Q//5+ry7ePbd69e5DY+vt2w -tJqu/UgnYH727ZvtZ2/20r9u17H7dsC+fff6h3c3V68ur7YeK35520EqP7W37m3dsddXb97d7HB/ -6PP76pzdumev3r384+Xbi/dXO6zu9p199fDV7Xdvr99ebrj3mo6+ocf/cn2zS09nL+3tgskW1dbd -/OHizdWz11f/913euDtcNyuvbXlkLfXH3NWf/kXRnrhXf2mPng1Nv3tW7v/Rcv1qw2adXaF4eF/r -8Lvbd68vr/7j9cUvP19f7tC/Xbq3v95tamfTpdtfrl5fvL19vX3H6ht73lnnty9/uX1z/Xa7jfWZ -WkHK0eYG/NuTqx9PvjnaoUc79LPcqkc79FDsUH+0Q79iO/TH1xfZ2Lj5w+31m6Mleg== - - - cJbo9nv3aIkegCW6vUvwaIju/+g8GqJHQ/RoiH4thqh/yIboLp07LEP01D44U3SnLh2MMfr46v3V -zXc/X7y4/ftnCo0eonnGlzEZ6g/uKv7h5t2Gu/WrsMzevH3x5Or99QWatYvF0r61Z3XjPy7evXlz -ffHqMc/o4any28/Wix0O1Bd7PFF36NEOt96LPV57Ox0Xh3IG3v7445urt4+/0Em4zzPij9TTgzwd -HuTKu4HJAfTq5e3N7et///vPbC1ue2d9uNnBAyyP76urb365uvzjuw1b5oB1je3xK2/evf7x4vLq -u8uLnaZv9tbejNRh+27mCX93c/H66T9+uX119WqHqVx/c2/d3bm357ev3ry9+Jje1jcP1Ew6DcOw -/fI4EDPfDLt06jAM/VO7U6f+Z/tO/c/eNZw/3V6/evuteP725nW9+k429bdywR+kyvVxfo9DCbHs -qpAcik750BWtY/Do/p8c2+tNf9vhuPjbHk+LHXrkduiR21+PtlcA/rah87MemYPo0QbP3KxH/nDO -8sO5fR82wOHm+u2fLq43WYEHfAlfvL5++/PLq7c7zN3xMj5Ms/4jvOMfsU33Ob2/v3r90xXG9SB1 -rZ3Pmgc9O5+1FUcg1xHItUXnzMMFcoXte3YgDt5dVuJhuHcf/e75+e3tzePXV1f/s3008ZhX9PDy -iszZ9iwJry9eXL/bYXz0+f0akA8TlLdDj17s0KM9bt7te3RolvCL65uLHUAbB2wF//729S8/397c -/vThIO2kh3wYPrwjcIekrgM5Ah9uAuzxCDyQI/D04UGsd0n+PJCTb8fEm0M4+rbv0hFY/aUn58GT -T+yyoQ7ljNhelT2YM2IH7fzA9KPtoeFHgpC7MxjuBUHI9gv1SBCy/+ttAxqrXZM7JmTsNxNjlyvg -YFBBD/Gq3n4BHsxVvX2XDu2qfrR9LPD854tXr65uvru6ubrcyZux/ua+evvn7YO5H93b9Tf3fJ89 -uX7zy83F5dXLq1dvf3/xy0Feai8v8ue2D4AekrU2nOj/PVn7q5n9devu01930DP1+QM4Xw/mFtyR -4PQQbsHtu3SgTq1zJKX/Xo+awzsld1l0h7KPtvclHMw+2r5Lh6ZN7pA+/uX4h+7bLv1xN5zaj9c3 -NzuhuG72N//br+y3tzvoZ7f769HFzd8vPmxQpeYb9u3F6912LL+wN/Vz+879gGKCO3j1+PG9rcXt -O/ZiU6rHLPj7bo8G7PYH7I+vb1/ucGzQ0/vq1faXQdPB0oY/UD+27enKa/vq8s31q6uL7ROMLi9u -Ln9/+2KHftY39tXFV7evtr/lLi4v3718txlWM5vK5p19dfL1FflWtu/nixfXb6/f79LL8sZeraOL -V9cvL/ZL7Xz4jI+n4xGPdO9NzsuHh0faoUsH6ro54pHur4d7lw11KGfEw8Mj7dClg3NLbR86OQKS -DgCQdKyde1AX3PZK72Ehkna5BA4GkfQQL+uHh0jaoUuHdlkfEUn93h4RSffqUvuaEEnmq0Mk7XJl -HMot+PAQSTt06UDdWoeOSNpl0R3KPnp4iKQdunRo2uS9RCQdQnzsEJFVu2zN3U+bfc7sYTN27gLi -PM7LA2HROZxp+ayt2GcLHhSF6qPfPX9CvDvPd3Tnbal5HeKFt4MX8MAIvh42Xf6RQOp4EH6CgzAe -D0Lp3/YjcTwIjwfh8SB8KAfh09dZclQIjwrhgZ+DV1jHx2PweAz+M8fgUR08qoPHY/B4DH61x2Ab -/3q+I9zhAZ+G24/E1xgDPe6t3fdWOu4t6d/2I3HcW8e9tbC3/nT9j6ubP91cfHi+Y+rpfQYV7bl8 -2X44R4aTsD0olpv8511wsc0rB3pgvr56ebuJ/uBA2Y+OXEGHyhVkdujZAZEFnZhv7HBiQv7f4ST/ -/2/y3/Of3+R/OHmw0P3rVy+ufrx+db1DWOn11S9XF2+f7DKxzSv76uiW18eDoUx68wtIk7bu7JEy -qTeVR8qk+0mZdN/UtIdcbfaHm00n/QHmcOzUqUPL4jh6WQ7v7Ng9RnUoFAm7nR8Hcihe3r785fZN -1pr/+G7DwXDA58imyXgYwcVzncqDPD22d4H+bYcD4297PC926NEG/NasR26PjqDte7Sh87MemYPo -0YZw6qxHfn89+jgN/lDu4I+6rg7xLv4izJ37cZe/vn7788urtzvoiMdL+TCDPh+3oI9Jpx/bimNw -/nME53fkfL3P3qJjcP4YnO8M0TE4fwzOH4PzX+40QnjeDt/sdjIdA/L9/XcMyB9rGB0D8h916x8D -8rf33S1+DMgfA/L3x3d3DMgf0tnxIAPWL65//PHdDhWTDuXc2LVfh3Z0bM8F+ebd6x+zXvLdjkVB -Zm/tzWjd3mTl+T6/ffXm7cWrHSZy7cV99fXD1c3N7d+37vDN9U8/v80PnF6C3Hr7/q6+d/+nlrfa -jut39tKWN999u3COfsSjH/H++REfZEVwPny/+en11dWrb7Kid/XN9asX1z/dfvP++vbm6u03r69e -fHP7+uLVT9tvx6ODsb8x9+5g3OXmPHoZj17Go5fx4zry9XoZzbh9HOrif65fvnu7oeLobH70hX0t -wbh9565u8n/t5rNqXtmzw+rJNVmE3+K62CsY6QmbqN/KvXWQW+JBOs/e/HJ1me+D1w852cN8JZ6m -Hbops/70H79kjWMXX9P6m3vr7vZnuDZ6d9fa+pv705o2uK0/j2Pt6HS6PTqdjk6no9Np0eMCFxM7 -ncQDRb6no9Pp6HQ6Op226OfR6XR0Oh2dTl+D0+lGvDAPC6VydKUtbK7P1ZDvxCQ9aF/aw85J/xin -2tFheH8chkd2mPt/guzA03Eg7DA79OhA2GF24Ls5ssPsqUc7o6cP5hZ+2BWSbq7f/unielMs44Av -4SMrzOFcxkeqtvt/GR+p2u7/ZfxxhuOhXMg7X1mHdhcfKdqOl/HBU7TtvpiP9Gwf24p9tuCh0bN9 -9/PFi9u/Hwun1cn9r3+Om+0QD68jOcaBKhjbUyoeeST2v822LyT84sMOSLYP+1t/O/RowzE869E/ -DuS4OJQz8PbHH99cvcW+eX31Yrdj/p84Efd5VvyRevw1GiL/xFw/aIvkvs3TF4uzHM4UHY3GQzAa -jRt+s/V6/flqM3yvXbP6/L5uSuN36Nzfr1/sAqWUx/fVtVMTtu/aDtraHpW1nbq0g0q9R426umSO -dPlHl8zRJXNwLpl4dMkckBY+PjiXzA49Orpkji6Zo0vmXs/1g7b379s8HV0ya1N0dMkcgksGRuPb -i11gRkeT8eGZjD++vrh8e3Hzh9vrHRIT+PVth6n82F46ePlZwVX76dKOXp4DSG3eoUuHZtvvQJ71 -6t3LP+bd+H4XTpb2nX118dXtd2+v315ucGvPvBh4/C/XN7v0dPbSvro6nG1P/fbDxZurZ6+v/u+7 -q1eXOzgCVl470IvlATODDWfbl+J5e7vDRXm7vz49eLazB8kJtstp9OPr25c77DB6el/9+mqIvna4 -Io48X9v288jzdeT52hfP1+fyff3l3esf3t3kU+KQvaQPlYRoF4P8QHwMR16eL7a3H5RX2QwPGei3 -S+cOC+i3Q8cOA+a3Q4cOBuRXlYDnG5gwjlGbu3xHBx+1edtqgw8vZoPuPdh4wPZYq2M44ADCAcM9 -jQccDdGv0BDd6eA8mqJHU7SnTx1N0S3WzdEUvQ+W29EUvQem6PYK0NEUfXim6IMHED5oY3R7Lpaj -MXoAxuj203m0Rfd/dB5t0aMterRFvw5bNDxkW3SXzh2WLXpqHpw1ulOXDsYe/d+3ty9+en2xw/l8 -NEYfnjH6sOvQ7MZpcCCZXw+a12V7e+zI67L/0+NItXvkddkj18eDO9qPdDUHdPj9eJM16NPL25vb -1//+w83F5d++OWHR7S8Xl9dvP/z7Lt7FN28/3Ozg4JfH97VOqdMPbvft1qsD3XDPsEQPcr/9U/xO -h+ID3nFnHch1/Ya4Vs8f5Kmxnzv76Mu/J778+3ZKPkh1f+c60Adyduzar0M7MLYHOr159/rHi8ur -7y4vdlKDZ2/tq5fb82XJfJ/fvnrz9mJTrdGZA2H1xX319e8/70IxcYMwW37gdAu1pu3u6nv3f2Z5 -p+24fGcvbXnr3bf7xrjtN/nF/1y/fLdLLLO8sK8FQAvx4ZHHxe0Z1q5u8n/t5mNvXtmzKvfkmo7L -bwUdsDdkRm4Ind/fyrl21Czvi2b5MUXNj1rYvdTCtj/TdNKf/uOX21dXu+hh62/ef9VE27y71rn+ -5lendh5Vsnupkh01sqNG9s815Ds52w5aJXvYePiP0c2Oeuf90TuP4YL7f4Jsf+38bYdj4297PDV2 -6NEGSqhZj9whqPp/2/DorEfmIOZoA4Rm1iO/vx7tHKE6mFv4YSPEb67f/uniepNRfMCX8MXr67c/ -v7zapWrR8TK+/wf9gVzGO/ToQC7jHa6u42V8QMbV4VzIO19Zx7v4eBcf8l18iD74YzHaw1C5vsRh -ejiz81lbcZDr48GTdX1cCOEwFIq/7E76fWgqxbFW5npHD5eP7MiNfVi3w8uL/LntWUYO6V4wJ4P8 -397fimTrvtNfd9iP+vwB3R2Hci3+R377zWaI3+HnulLC4e91jx7e8fKQdbOvImHyyGZzSNvtdHvl -61DobE4fHp/Nl/Kp7aVzfzwSwBzOefFPTNbhRJt2VxYPZa8hPoHJ+8tDpqs/YjDv/znyUQvxEHfZ -9om0h7bNzNkOSXZHVX/vW+5h32p//fHq9bPr1/fGv3PfZv/txQ87zPwheW3tyfbxIBqF73d0y85e -2vMp9Ozdq8s/H+Tx83AX4Fk6GU6+riX4H8cleL+WoPnaDsHHewX3kPEFMoS/vL549ebHbUrQ3MP9 -8LFpLofix/kovfCQlF6ewC+l9h6dOUdnTneOCOr46ObmaHt90q16hN1+bCv22YIdK9L95tHvzPD8 -6asXpTIdyQJEz/9w++pP+SvEz3Mq8sdXP12/av/l17/6wy/8Hc//+N2Hlz/c3uS2uBcnf/rw+uLl -9YuTP19cv/rh9u//8ut3v/5V/n/DyRP8zx/xP4pw+usH/Nf/k//2f7Ls7yf+5Pcn/+//N5y8+HX+ -tz//+len6cxEF9LJqQln3vrx5GV+4WwYrPcmC+2ZCzacfJufhNT4GE5OrT+Lzo0kXXs/Cx//gAH/ -7X+9wtC8OPnp9cWL66xWnRj3L9QoH3JbTIPEMiePc4/HMzOGEE7qn1Mygzs5rX8xYTiLgzEnow3j -2RitO/lrbrBxZ5P19kT/7L0Z/Vnuic9ven82uTGcPL789a/C2RDG3Gr9c7vffMyDNJkpuZPyl967 -PpwFn//JRjRtmOhVezbmB/yJ/rnwog9Dwpv+bDA20ZvbdNTbsxAcvRnPJjNY6uiPWAePH+NUG85C -uzy+8BIYeA2kobsGcr98jOOJGc5G7/yJMWdDctPJaR4El6dI5sPkEcd8xLM4TZbWQA== - - - PLPWjunEpDwfyfbfjGfe5IVl3YQpjTQyJg+dyz+Fxpu05S/SZGx+0Y9n1owj5sKeGZsX0eMtm+rz -Qz5EvJnyEupMYtrbHNrpHs6hnaaUp8IN2OTbT2Le22HIh405S2Nyy7MYreVZHAZ9MUQ35v7n2ZmG -2H8xnUVjRt7+aZyMvDkO1uUxtmd28Pl0WHh18AmtjblTLk2faOX85vk7/M9w8mf6I3dnGJw5ueMv -/8nPt0cGXgzRxIArxZz8/te/eX6af3Ua82xjBUW0/CWey8st+DgmLDeXe+RoEYrcTfkmOM1nmRnz -Scfytc+Q+A3+57/wP9PJb//l5K//G9159Itce3/ktb6pI3/b6WJsGzKM0aM/eZjzlDs0Og9tMPm8 -tWc+L4O8cWz+HRPjSdvj/I9jXnHntO2CH0c7kjTvjokezCd8XkIQjSH/BIms9bGOlrwbcAOcmuks -haCv2in/vsnbIY6Of3ZyeT+UAdWfTWOwJHUxJX4wjNNIonzP2pP5ZCSflzreRdfyjsnCfHVGT6vM -jYPjUyJ3Or9ZRyn/bZi4vTEfJthfEJrcbTzm/UCScJaXdjhZH95LGV7+vs87Dn+pbXD5E8bP2poH -Ev8m/UzGYlQhdQOPUf7aKAPiTRRRSL6O0SW/66Y8wiuDOYTVIc/nzuDr1Mi7VWroBIW24DG8WRLc -4E7meyAOoYwuLxyTWzeYk2ZxjWcx8bCtjO4lja4fLQ1JyBeQpUkwNqsIPC15wDuje05HQN5BZf/8 -9tGL2x+uTs4vbm6uf2Jv0cnj1+/e/Hzyl9vbbPVho+Rz8a9/yrtuyEM15IYP7mny5+5p9O5xeOae -mEf2WXjizofZ//Gz/8LrK//nsfdW/57vpfztvOae5rMwxvNokqeXnmfj5u3cmPvN86qBU+ufU4Ov -Xjz/04UwOf7mOdTv53xD5iXbbvb854t8hOoAGFaX/zw7PKbR51aczI+/lVPjbBqmMY87H32f5ep9 -Uw/qtm3J5+fWjuZ89CdcI3/HMdxrDX9lrT10Cnda1PvKFqfwk/WjeL3Fu53BbTOcy9oTn8Ep4TDK -Z4QbEk7PvG+glWNT29HZk1lvs9I+yhGR+zoFx9KYNz8kzpuRR8VHuyLBOF1yh+RFnGPRcXemxKd+ -oEMJ634c6zheyi9WqZ/4QWPQ1izJqv94Mp+CZJOeDm4cI58OMeCX0G06EvPpEMZ8Mc5GJ5h80F3y -kE1edr6Xp0h9oDGMODfWRhU/mP865SuFbjYcUaf5pLJxCnQCjolO1nxJjZ5uKxMsd9HkTTZQfyye -P2lGOZ91U8Ik1OnAMAzjtDIdOCezFjMbinw6DnEuMnm682U1H9g8GA6HYSPJPQn5FK1vYirzksGv -NsJ8iLsgN5idklxNoTOs5zysHuYbCQdcvFlCRzp+zxvXGdbLT3LmPjJPYr7xnj229unw1D2zIeV5 -ck/bA/XR/ThzB5iW411n7n8t/UgS/8x33//H8+9+vvjl6i/qnGm+bu769G+e04H+mY/AVx/TgX9b -fXhNkE0Cl5Wbf/vz1cXNyW+fXGeD6+3V6z+/eiFfyKaLTeXfH7366eaq/cesxZV//DOqhr+6evOm -PvDNyW/9UlOGrFhk5eOOXx6gkyz98pB1ybt/eVr65U2boSw7bfvWL0z113nJ/o5ovy+vnj+5eHvx -/HdPnv/+4pfVZx79bnr+9B9Xl+/QyPkb83VoMAzArmHVqf2BZSQ6uqyuvOjyEjIh2dkSwoOeVLNW -B1h7+w7z27PxfXqX9U3nPZnf+CaMRFw1ZCROsBFdgA2a1EZkLxpUxcnw2ZgVHNd90+evTgbW5WjY -oQbzMh/XboKqG89SvuC2/FFxo2XdxdPNYazB/dJ7FcaLI0MavcoXNDtg3BQnXFVjvuHC4ptmcvxm -MhP70bbqqoNXwXp2GIwjfvRuR9qXWwNjuIeLgPxhuVPkDyO7a8s1sNWLeZJx0c89advO40j+kOL3 -udOV9gVn8T5uZfZOsV6d1YOFXdXfyvCIUd/hizBLb2YNJKhfa5waL1wkJTNlo8H23/X5mIlhxZ2W -V4+DU+6UnH8Lg4Tn2SdWPXifYPEUb9qTz+JUgwmbFbXqciBNJmusYfDTiosMz2YTZlpxqK19Yk/+ -tNoOcYpRHER9J+I7yxads8FW91rbVfVjtDIf8yy1gjH3sP539UnRl3FBqecKv01TrM6t2fipDwzC -GEZbfWWQjMGF6lDLs6amR3W8kZAsRPUpQSJWpLiUIBG7qHqUSDixVRTzVqAfhDttQVLfy4ZYsrPP -+zEbYLFtQm4mtal6v2YyOMlyAyyFs4onrRmZ6nGr4yeOuTrC4rtbm7tLmrsxRba1BmvyM27w4ijM -Bt/61F3K1NGiELdYXTbiOWvXuLjX8oGSgo6jS+iWM5Yty6wF2JO19fhprDWXjXZYa49wtAzu2bNn -0/D46dxaO0gPmYl54iRum6czTMO42TX26a/S1jGWl5vJyyD/6ORd1tNoISSMUc8x1mtLNts6reGH -19rT+8ZObrE72rubW6xtBrm36Cx1jr004gSDMymGWP1kbVfVP5Fl1g7qs/B4xvpgxM0Rx9lL6mNi -N5Wvnij89jT6xlnVjl/xaWE+2PveOr8kaNF6yBpR40rTc7F43GQMxCdHEo6dNL67udR6DtDot/qi -9t182A/s5DEcshkkipP7ng/vqe1q1pxivrP0TQ675OMFu+WkFcEkwVdJ5CJ7AwO8Uef6rkotTnJz -Zl0c+WNj/nmOOTorh1ek38wfzevKUDvMMCIsndtHc5nO8nGOiOEUjTjIrOGrNIVhYqfZmE8arM18 -icjSGkkhaxcbDbT0LwUzsXMt62T0mJ1y/8S7OpqT9WX6aYIQT5+eT3ldPDuP/vGT5J764ZF/8mwe -hDg6xFqH2Oc7+j6fOwwByrucUjYv6SWnVJ7YDU6pO9xhI5zBd/yyQ8ht0REX80nzVbrDTtw4rLjE -cPFYmPNZlzNQGyUwxsoyjhCK2H67Gi7LJ1oJjIXgZIEO9OT6R++wr++Gm2Wj2uZ766T86aGmWrow -+S9j3h9nKZL55ye+nwhuNuU3st5Z/uy8meIZHbfZrswLEpfHY9J/88VvYbLwn9v9JlvIxuTLKB8m -+pfuu4aV8WyuIjicD2a8i1BOPvDlj4X3XDbl2cwdRkGbbNNPn1ubz0y8me0OM0ybnGR7XxX583fC -l3LfpoDeGhgjeY7GbDFypChmu2uUOQoDgwnzvZryD/6VVFsMcDrJN3C+iVP3zRjYlZ+15GzzZANS -/KcDUBHZnrfB919c/0mGEm5+EUhCuE6DxVTxe9s0NWTLDvBBwj06LIC7HWf3YGbTfZzZwWKC8g9n -E3z7mSUL9gTeJw94Wn9iobTyzIbR6HthxHsxK3IL8+rzJZdoy8Khlr8uqLRsZg/wjGQbPau4C6/m -c0vPCfH7fYK19Jn9aOSkiI6AMbnDQxRwGs5ohkxlgyTYqcWm+cCuxHzUjo08cEQ7qyeTjSJf+/q+ -MGulIVmdTy4wZi33wSf4c8e8qxJ8IJMG7Q0gGoQICIMTlFVwPgnOKJ8WQT1kDDOavPjCRvLvBqAZ -koDLvGXbIH+iGFxpgG2Q94CziXf7EIOCuHSE0aoCVqPxzcJovCCn2BbKonEw4wznJpOjr7KpNp7Z -yUwzjFxu/8TILMHRlfkrr/IHyVTzs589y4qmFxG3DU5HzxZt3kjBwMbO3R+ioaGFTu0wNPlSdexX -08UxwZdIL2K8HKHgJtINIIh54eTXJhmX1anE0JaveyjAI/1FWmCzgWqjPWkXqXPZjClDK0Z7Fue5 -s0ZAboOjocr9HtmIVixcGaMCkSNARjOWYsy3A+5SIHNSZkZfFSmtA27igM+RKDiXZgsC8PWBl1Jd -OI7t77q2EA5KsyWYz7IYnCxdXam+QOR0MeercgyzNZ/tHLh4eYB1Z+Tx1OAH756Jl1NnQi95QskV -jx8Kkx3FD8OnoCFM8vqUfhp7+NxFbx+58/P0+FG+Yp6lRy6ax+7Zwbscy1kY89qcwk6gvC+mi3SR -ernBcNTfjdTrNVG+stbIVfiKNFNgKqsN7X384wB86x3Z8UKqzTAmq0h0IU0Ecg50iuUeToxtC4ST -O+NOllGApZ83vCmQMTo3IB3CMDYgr/w32EpmLuIBnGH4vOB6aEAnSp3JyowAxho0IPs6VwCB9NOD -wOEI9BDmaMO8ibwA41yaJCg04EqFNuQY34DYBuC6+QhyMbIHZkDIlY+gcRgS/6Cxgl/LfaPLxea2 -85Glw+qGEPmMhpBur/z5GA0/ZqkNgGFHjPjafJyzgjB5hHImQNqmic86OqnJc4fGtMuMjmTGGurZ -mzVRcoZahTfiwDZ0AuM64tGazBhkbCzHXW3u6xTnUD0/uHEuMROPaSM0uaUuNjjMrMnkM6pFZk7S -4st248fcMVxfA66SKSg6UcJ3mHXjVxGGcgcN0OktXZFmiJPz/Ld8zdH1RbtM30WAUPHmQ4o8DNPI -8PURkUFa61llorYjuFLA3eLGh6eXweC4x13gm9fZ2Jn9c5l9QsMCzxid4GPhqCN4+OhtZ/Y/TczL -P84Ni+7ZlJ49eza4p3lbPbLj/AI6OmRbh+wejv7P5qlN2O93+EuzhhSXPbUIwX6sp5aiaXf9MhTW -RU/tFL9eT61ZBy+u3plw/3UWEtYcIWSw5kxaV6DE/O198g7Pjb0bCAXHjRPD0PINAB9DNOJjmAiq -YxGOHL34GGAMwXWD7NkxsFEy0Dc6rzqL1ULZdhNQHVZ8NwFnKWn6YTAL767/rOIaw8TGZL7GHaKM -3bcjMo/JGWMIqMCQJu8J4g9g0iDYh+6rhp0xGBb22W7VXUuYF3Y42TjGLYCN+10fua/3dIXk6ynB -osuqgU27LJDtXo2UX6bOW2t2mmPAdlqv4ibY477neAOodU9zTI5Rk0hjy0NBqtUOx0AYfSIdGd9e -bHRizBb7VV3jAvaJnEhQKeHvWXjZJA76wJ9ro66vgZTzPEkTwaQXFpjHTcg+ZPU9f4oF9tmhkYHD -1LBepsEqNHKagmFVN/lJotR9/yy+4Cf2R42ATvgqn315b4jJ2g6PpG+e1GwnFk/qdAKHGFnO7Gw1 -ILIoCU7Osx8N7rBkkzhu88qENywJVi+EEdigQLcQO4ANOYDhCzNsWk35LmJHWGA3ckRooePOakba -erhjG0EkpFHPHbrmNCWvJmBJ6letc0Xu10mSuTStlry0E2EsFZ5DkEOSiBO4TDK/GUwKIxtV0RAW -M1gCocOdiXwESDwtdV0HjM5UIfLdArfM8vZqJX5cfU8wi83nJcO4aULjeqWm8pvieQW8iFLWyJdr -Gbbk8u4liGZdy2RAGga9yjDCOQzE18x/DJBYz8uMJQCENmSED4fAsGk5ZYPVrc8h3tLlMQk2qSwf -y1DPusTgb/UjL0xdh/DKGuA/daX6szyoqVnOnn+TkE665uEEjohY6a5gN3HdOfAlmw== - - - UXCuQ2BT3BJUFt6tFJOccvT82o77RA7aZxF22rNp9OePg3tqz/MpdP4AHLRmTN7geMuLIhpxEyZc -KltBQ7+MujFDjPp8WVGD8wplKKv3zrklwGinhfk26drXnVau5RzqzbPQ0h2QpIv92BlIyu0obla6 -/PM+dlN1xk50Wsbqr+35kSBz4mwCCoT+OwkVAdykPZ8luTjZ4WjINzqdTfmcYg/fFAA/Tc5KkCbB -h0WHhubdUoY07nRnGNdoYK0hjXec+HKL6BwdGfpQtqiwPs1ZMklh72lcyRn3WASXrceZpcavpBVn -jWlVMrDfmP3KyVnxME6cw20iovlNSnTrpK5irETi0KmOyI5ozcNdfsUEy75Q9nmP+dyf4krCu4Vm -t+rijh5I/hDEXWiHYGYDmm3awMBhAJgETIwByipgjJ6nwYe8EkcgHiRUF4FHvSTIVVbh+cQNuNcR -6MWayEss3/weNwvHNRMyFqyuLAoI4j7CEsNCIj86FhLsXww77ilouqRFX4JLzEbgLrIGkShS4LHS -SHfPSwyTNNuEWbVEIFTmwAYKDA4gLwGklcINA60RXqadjfNprgpz/vSxse7Zk/FZPt3dk/R4dI+e -HZO978S2fulT+rO5UgOonO6Cnmal5I5M7IqY3R30irvjjl/Omudy9rlDHOVrdaXaFVeqBSNGNmFs -Vo3FLC3rC4duXovrykpMMO5LiHniZZsPBVq2a9+8y4lyN+Q1NyCrDCflz4kYyE5Oy1+IJ3GyE5Ba -fuB0S/hPKEEhH9j6Z+/NceJ8vNGCmWjIF89juimyrk6pJfzndr8pkFeXJgm90V9674YEOxf4Ro+U -jODFg5Evy4EyCunPhTctTGZ6kwKrj7fsaZDkCPaaDOPGzPB9rwprNgAjbTZJCBgJp4INyOJ3uJbz -3oZFSlM0ch69S9ACaFVMecANiCyhneWR772Y4HOg+YF6kewkjtPcpqxTBuDtkdO3zU+yW2uLF/MP -TYmWBEA4I0/sNo2NOISjZew1xbbvdprue17N3UyM+5hXJAZBCccLcft5BdYE8wnOBbM4rQkDS9Oa -p6oQOA7Rwk1xBjN74SfhbffYsB7JqPrmCIoj8LC6BNRX9808GyCLzW/G/PPpk62lzw15tXlg7IjO -MbbmpQaHOeknkP/JNchWAjwOYEPyLeCVuPbyAsprVsWrn94X3FXb4djUJLDrxK5oYDnIWEImuZ3I -Vsq2TXDCm0dQUeQ3A8Io6BlLQM+8OAW446GQJfZKJgEFDm5gegBsYsVkMrwv3wlG4BaJffXZbklY -FI4IORmSSeaCgBvzgFsy7FJkGM2ZHwdPCd6B0NKYAMBGYGeMlATNMKho8osYNsQLRuGNdJbRKUNx -DopLE66X0twixXYZZpyTyKv2Q2wk2Gb54i0vwtqC2W3ZrBXX6kjBdIXmktfXcIbjDJkLiM7APIfZ -TB2I3zk3mUGvFNsaOdue52Mg3oVs3YMrlSaNkvIBc6F8yroIrUEG4jkviABBnIRVAMhNmJTMJTlf -LgLbnKD64vwlR2RWCRzS4SeelJPZFsh/uDnbJITOKbMkyCbJdWiVfhKrS/dOwdHCx5tg9yr1JvmB -EeqdUmiIJnUvXirP5ER561YgqkDRptHQ3/LSEG+CApcHHgUnvJq8euAIznYCGdzsuUGE2VvHzlQ/ -ODKzE3RDGp6Qh2Mi7FrIF4glJcglcnrEgeZjbR4ueR7QsLygAlGiWqzovJ4dZ6auzsSnsZ3tE2ue -ZFs5PX5m3eAex8fTo2fJPTl4N+voJgACkfiVFeiJ3azs0N/oZv1CCkrrZB3zfUkhibxDjBfYrrU4 -Rzpe1k4DG4u8aeKqQV4aqZCnlWZ2vr2Tj/WObux4S0kr3NmA8AlfU+SdAP+FkMwR21z+OWTaeQFA -6gi4IaSCfyWHHgld48+jcRrdisDMoa8jFhD7rNhTiChQGFc9ijywcxAkbhXCakGUJQyDDKMdZhyN -cKQZ4/TQCfCWkR958omUI/GzlPQFCjdGgvFPlPEhpw6YSwhLP9FvIaXdk9eWkZLtzNLhecnjjFMQ -Mk/gfzyEcL0DSx0idKszcc4KA4CW+dMDOTsR6rZMRDSw19vErDxHCkYa6zmeR4hd2H2nyLKnbApI -ImcAeDdEdhnne4cUCEeBNFYXXLKcMiLnPfIDiPEom5ITncCWKc4ADJ1MddIWh6NmpFQfMrXBNFOR -P0HJmLNp1IBeEYxI908NZhr3mQ3j7Beh9VBGAwxi6BiMtaW+G5PPSHjtbUxR721SemDuIwCL4QOA -lugI4B1Ym7tz2SPI0wBImBzkmEyMvoO2Huz63H0a6OrjJ09dXnZPz90TFx+7p0/sk6dxmN8ZR39r -62/94uf1Z/O25oV2J3w0HxrTos8TGsZHe1uzTX4nuYEBmHfRzwuOs6/V2+qWgKu68OAhMoxLalYR -BSMNs86DBWUeQ55pPGtfvMP9shGvlr8/cO5ijGSRkJvAipvAM4wKBgNRW5KbQBKOHSBkngOj0Lu7 -byJplfFmlKTB/pdoKS8Ovk0kAm/5mwpZTRSOg8PVDMTB03k735DjwB7XfF0YpzR8ATYcoo+Wycn6 -r6bgPL+aoKc+3rKz2Y63wbDPiFDv20JW97Iy0nQflwa4nizHUbNGuMvS2O5dGIeDKX5XeXfL2TXQ -rKtLcDus6l4m121Eq3/5ySVfJuVukTMzLL26sPHhQiWdNzJ/V/dd8jGqI3SsXttA2Ac4c5b6mhfG -FBgqCverU4BqPgtIjUxZ9146bLJFFNhz2zh9//k19YXgqerD0Zi0IS9KYG8OKzjkDJlWvKkF0Dfz -vK5+dc/IVLjosm7rGTU0ggQO22oiol5aX5GtGQqzkYOJMzAj+VOB7SDziUwkYG4oOujSBO9kcnCF -6uBUT1EdrinCBVf/O1AuXv3v4hcEMggRAjh04cGf4EBNgA4xFMQjo8/DjrETw0dgZaRsw01nyY4D -PFnDOOWPwfTBGgS81LBPM0+oJBkatvsMEfyZCj2FSzAQfIQ9qPmjUxxHxZOSpxXw2HHil8jIckIz -UBCnjTewolAHziF0DQx1LvLjyovsWlTjs3gf1R9ZHJSN17JAUNW3WQCo6v5sV6s6SRO5DkPxpJKr -1VdX68rMXvLMAiGPzQ28Pf57zAvHMqHh6sReEkERrZbijSzrCQ5LuLzLossHBDEWE7BZViZ8n2h+ -WbtWFkIBgrZe1IogHchqofRjgZACiUccEmtb49P4NvO45PPFPTt/4h4PT93Tp+fnQ5oeAIR0HF0k -Vzdi+JJpbseY0nbsol9AC2hdm3lbMeFvyMdBJOBrion/QsHQu2CkTSvzob/eTsYsrba0hSetWNG9 -1m7v39zYl4+EkqrDkqleIwJK6tRks796PXUQGp8O/D6DIbcPGEXpPx0d9sR43Ayb+v0QWzAU/mV3 -I1F1OvItRHIWAiWeBJqKxG0+AoQbE9ZKyAdAtEEOgHyIp5N2zBuXZoWDFu/nHCRWfKQrbg9ChM7d -rXDAqke2+vIav+1M6EyaGj9tV9I6fEk2caCwOnzTWXEiskvY57GLmqLAfAgG2AmOQ6WRQlp5c+ar -gUOGXFuI1D7Lv+azaoe1Sm7eyaAmqYWllk9XMGVT/Ivw9ohCobyWYDrznNE5LV2kIqfElhKIPRrx -vmAo7d0SlghvSWkiI27LfPz7QPhMzzymqBFk4EUcKZWJ15M3vGCIzAZKoceEp0iO9Iiaa1T+lUKY -jFGlQq1ZZ3TErJZVR0+Xdkpj6+0GeNmMpSARg0YJ0Tz6AhnFtEzRn6zvj09zMYzh6WNr3DPUBHr2 -yD0N07M8G0fA6BaA0S90Hn82/2V0NtyJFh1qbv164j3iKh/rvwwA4N/xy1ntW075N6j58LX6L/0q -WnRkwuxmLTYxHCRYBjPTV+jBMNY4LF+fdHJ/2/ngHW6MeDdUVCKU+qfFn4ZruPFfRpM4sgcL2+DQ -jwwVnc5gOOgf6+/ZAWaDhTtggJWRmClxhMrsAQvhP7f7RQGKRtw9J+UvvXcjYDiDgEwp6iBFQBIG -Sv9ceDNr25HfpG883qafeZ4QJHTs9qC8lk0w0T0uh3yXbcASujxpFHsm+805EHBwmDM3cJLpIYUj -K+kJpTgYTWjAyIzgXm4MLMDemyMy9TCx2axldiRxWU6R8lXzrZSHb7vfFIflxjcjso0wq6gtlIQ+ -c5vGRqQlMYBxOiPLeANKdJ/TGu7jrJKNDJA4NMXtZzWPazbvA6FER7ArL00r1EyaV7qexVNpE0xN -g2+4fk/zqzYONLGB6xYITjTb9uSI8Cjw0X8Vw0ANJm+j/WSr6bPjRPPPT5ZD/2PBiUKTZjdUTMMa -LyryalNIjZjysFF+Jap09bt7A4lqO4RXEpvPcqEgpKMR+6TFAQDzKJgkEIXJTHmFKpoN8GZ45Lgu -jpA15CUCt9MJE7qRa8uTQ55wEJxzDROPk+eQYmApB3tkAIinkjfkVSNOskviTh0ABqHtiBsKxA8M -K7RgbGGrLLDB54ioX8wPFzmhw8E5JlBMyoSnRL+WNrVUqCj/fUZkbBWn6SnG0wA8CXsZTIGBUtFy -GGPK0UpuTVhj4jST7HosolpLowqnfCG2uFNUFRJEo0hwVVtbXiTAqpVT+pTqH2EoUXLbclmOcfJw -0+VP1aHkNZn3e2DqN09kcxzGYDY92ndwIsYGepTXMuzCZIiQEEy0+S3Yp5TM2SzrwlubZZT7SHnk -FBxL8CzTOc6Tv7oI6bdG8KX7Eypg4iiYwT5gixx+LTnOnchGsB0LnjbbZqypWKOwW/LqWiQ7RjOX -YEfqhBPbK4IxSK0/rX7dvH6JGLhwteoGV8xqEc75Wwsguj0Z8rlmhcvOJkCqJiHdY0IEqinDBdKx -kXABICAwCF2sAQmhN+wscYzzBYMKDl+yzMrmxHKIQpsnGzjiNgsc9MYGH/OTHMZembVLnrWJvAiI -enl+iFY0LHRrOrP2iXCqgzePjXuKgr7jU/f02TCiovAD8OVmnQUOsYjl7Po30ga06hdQlGZQVTsC -MYi4g0X6xtIlOkesrjeyNf6bZq4Co0JJoFhvaufDu8FVN3Zlx2uzNkbdubQ3B5DRA5U/eOEJTXRi -EffqbBTyqVsrfQdg9kkYW68lJIOdC2j02oR2fH1o89nhtWPHZIt2rbDFIhs4eZsJW8k119C10n9b -I0fVQEVoJ+T8WeFcRQkahAiJxS2f1gY+a08MjE4VA0PxKmJ+zpOaB57488lhieJMVBZLaRPoldy/ -0aMASOIkczB8AS85Ie+R4ud14It7EbJxZJcjx+dHqLPUJ0Jerk0XXUvl09G6gQtcy4+D79W2LbRU -yEux+xg/q/QFgPtEgwx69uviboRrU8l6RNvJdz99OZDeAhAtKgyOqGViKK1mINJfxodqUkNKSGYg -HTFF08yw0WqL6t4G1jQWRzXLwDWRJOSJpC6tl0XeeY4ZwoMXeRkCFwxuGWgNbqSYcw== - - - QqwQ9wmYHXKbmY4X+p53BedrUXk1X1VjFFDxFMBj5FE7wK7P17nMV9bIeIklmVSkW5A7OPj1+fo0 -cNZHFHqH9/fJ02Tds7xUB5TIOnqDF+GsX/Qw/2y+YOL3vcMj6+9ClE5+/HgSVgc+sTt+Od8Py+Wy -LChYvlZfcFjCsuqigxtrfRV1ltt8YbqVjJ5mDS/CFTcB2txkhfJ8QMLsKfkxnBU/RqASL1T3dUiN -H4OJF7MFqGzpsEy7r+ZrYlQWQsrmZz9RMp5yYzypD1v+qkJZJ7Gh8rVNbOjdt4WeHBmN2QpLWo8c -XivipbfJIBa68K5QJzor3t1t+ztMuHLws3mCB781lvXLr4xo7unSyEa5Jw4gsCItvdtdG1u+S6T7 -K87hbScXABZ1Xcatwax7mN3hXs4uOVzJkUEeV+RS7bL1s2YcAsEE4C1eOjekevfcX8sO5oFysacR -ab9LiyM5hpbCTzwGXVh+ZDDjhGSy5YVlQlxxT3+KlfWFIK3kG3KpxM3X/MRdz2+BCLZO4tVP7hnP -Ci44F8hFDN8V7axBFXfCtaCCEnmtImjREvkPGYdoRmVKQwqi+Kyo4iIoKVp/8oqzecUX3fE5NSL2 -oNbxpZJYHZckbFG4i4krjX26ZAcB/jJ5ZOfFYWTwLDlzL9FjZGISLpNs+uLotZa9g1Xg8t+47ETx -6iKNcmLyU6EXiMynULCqOsctfpXwo2NDojoT+HHlJfZpkrfSNNhVcmgSQ55gV6vXs7g41TVaoKvq -Pa3rsvpYYTAnnkZyxJKntvhpO75cbEfks5GH1NMkEs8uqwhmbYbwCkgPCAzM3gnryWY9IWw9GEVQ -VJsAWgNcJgx0y2Ye0TSQHavdhqObCApkXZI3lcns8qolZyvZ/LygJyL8NSfN1iPgVQtwpWCgsxXe -iljDOFR0q26UT+MQHR7b3MlsrU6Ps6LnnhkUTzyfW60H6RCd8qVMizmlMcSFk3dLjOvnUw6qQxQN -y8vUUgttlE1lRp/fvgvZ2rQtn/49w7drI/dauGh8b+cHvasHH4lnVU8msf4wEaq6O8kf6qs/tOPU -gShqGj+cTyNj3I0wn3a8fTYfAci1KqcQOIYc7WTipEcReE+eyOgj4/px3HuHrG9HGQyWSCNwNBgw -SZ+Q8zLa1nmJPT4ZdnAC/xu56jzOBzsJq2l1kw4a/BtK4MfYBvxKzlYFlhYIHB9CA/trU2yAr+TS -NW0Se+P4nQnjoFyd6h9el8w8xiQzRMrTNCedSZo7xTNxK6ZSU4p7ZFCuD6frQD9AR3WA1zNhRA1x -rEyMHeYY7YhQYaLD0eLcjXk+0Kf8Wx7ltDSrgI9ucliDCRWRL0tnw4T5AqV3M6XEcMpKQkCGE/Ka -4Ie2qCkwsFc78joKFLqTMPM53SjJMIcqMVdYAk3T3U9oWHiriScLiktUqm8PggGDVZhfhWcXCFui -UpihVjHKQ62NxWBXCMF9oGBXK7/UDQN8goviCdzo1j2NyPRx7mky7kl8dCw0tQXY9Usc0Z/Ruxnu -LDEF/MKiixE8jR8NdEVCwR0/bP0dFaZGDNDX6tyMGxa5vFCOg988+p0Znj999eK7Dy9/uL1hgX/+ -+Oqn61cq+u2zq7zPrl7/y6/f0bW/EgGlg8hRAFr+ttONn+AuALcMaiIhfw4JLHL1nvrAHNYJYBlg -d6gY33jyPT3jE+AD3rFNnhDqAqrI5wMY9NEJyCEqNmGZ7QbZcdkeIciFB5giq5RZwNTSjhhizElu -bhKD79TFszHkf7yhFweQxTiKKmZLTgKVcBjYmC8wbpIjD4hDDZC8hPFrE3lQLXOkv6cPWVR8OHVg -uslXSzLEjHjqAGvPTUsDlwlHKCONpdmWCkpkcw/IHvw30aRZ3IZ5l+ZWx6xCECmdJdg8Gg1wHLLx -CJcBWyUGRV6R2eNO/js/BM5vKrPjmEkvd42sZ7xFBEL5odyoCUoPHnIIyMWIou7M7kZE3BGsOUJV -lizzzIfIvM7E4Qp8VAAhmdRSBELXj/C/cJh3ZM3Aw0Z2TEUDEjPPeC0aQ0c5JKNEG518NI+Pp9zO -iaaVlDNPWlx+ZkQRlYDxyaJAPO0OfDxQFCaGQ0MwgKgoT2HA9YHJyYMC6zTgdObfMglwZcNwQwhS -IL0xi5jnzmPxZxMvYIYBWPOiy+QfB3PtRB/2TKMQwH8vTlCqWoQf98zDgnVH8WFUbwe8in4e+yBQ -Cjp9GLlCPMRM7Y5tAN9HQMZl4H1BCUX5CWZzwkgGjpSG6Yz5uJEXPjGiMMsI30RfAk9oHFhdoxdB -kpWnmC4jCMgkh/sCuZsTP0TovCgr69RH7imWZhR6eR95uUYhD4aAdsp7WqxMhOfhwshP540hjUQU -N+vIa0fFOa36CcTF2OQj1hpgnZGInhLTIgcEy4hpb+TdyP03lreKAdAL+wJaOZYClctZ+yl2+PUP -1d+iEE7eOcE0J/7jx48uL9+9/PPt2ws8vKJIAB5Nejz/YSnbCwdnMJSZRVtGqw9RlRaQugoO5DQf -NFRFwUO99jR6p3n4SAn08FPkfXiDeEpeGrl3Dt6XrIevffv95+0U/5GVBO4X5X7T8YCoKfeLdi0O -OswzTnCUqc/dIkyGdIsIRb2wYVG3uAhx7hbN1dqnP3W33EiwKmIInRxddURGh9PXArHgEO2auMqy -o+ogEDFOAVvXgOgszw/VAs6zSJRz+V0KcAj4IwaGYhJ/GBNvMqRD2My+L4hYtje5CkRCQjxoV8dy -GhPaEskcSfCA1vMRAaY0rT5F57qlkiP+hLDyNn+aDRyu17Dat880qAQ2kUHNf/8bVTRyYNTAQOIe -4YVCHlfHVagwlgOxlA1Uk8RSwUgacyp0DyIBEBmgi5ETV27IWDceT+fzEOcM+OXQsfzfIzJtvqfc -eUpPRHU2+EnDGYAphsCsI1fBYqsVjmXLV0/KhyWlzegmlfr2FgQazCPR9mbTOQIYLOiWth3GrvaV -Bg7v0HIIXP47AhsLHcJEHq18KFPsgCq6hHzj4gwOnNRLRV1wPUVDgGZiDATDMi4FKcPtin8iDqyd -GMulYQIUl4GJe3ELh8Qs0FwCapQDOJD6xDUFs/qg9wh8ucj5w7WR78oxSBEqqPwx8p9UgQrKGl8b -duD2UNFt9J0ArMbyrc4qTp5phpcRyWpEVUDPVZ7poQisxiTlqx0T+IWJfQ8AVSX41nHXDnHk3Fg8 -HUCR4CnFNsaBmQah0qCs+WlgxsATj1orA4WnBloZUB1GJr01ROOAt3B7Wm61Aer9hr7EihkmCDdY -Vli44Ere9jQZ7/nnPNeDsSCgXZv6T7tv889N3jMYHxo6Qmil1PhABCPZCjkjb0bu3xTwl9wExNzo -PkVZbfi9HFKBR6F5RFVvPBTY047DaKI0E09MjKzSTlgSDoQdxFkD5S/RfeCwoQnCl0C0mL9NMRVG -FiMqcuKQgE1qb2R1ECdEVg9GaGnY7ADku5HjG4RHhuKCkxuzDaU7cmU3mjqFo+c5zSof0xVDVUb8 -8gM9wzByizRpZ/AQwlOk8eO4wqxBnaYQKZZS3hrK6AUFhFxoedV6y/cbxSRhc0APAygedwwlGcAc -8txAaFNQhJkXk96hdeTFvUCKp8ubExoXMSDndlK5+nPSuZn+EcMLnRtsQawnkEWwOuufWhki9YeC -VsSN4ukQo+AyJj9B78+rndfa6Ijim1P+UUqCNmAeNef5lgwyKMKq7aXfIFlK0OSgjeeDXQrFe0tm -HJRfxAywtSk+hQ/lS5ROjXxokGWVX6MwE7RyaItZPY/TCHrlRFokGwNDVlpPiHHI0JbNyhhYOAmK -j4EG9hWuwGq6UHgz0lkXcKbQiRSQUTGQoZDfoIp8dEGfkzFByMlEeQojvkpk3boBvdgzlCbA+fie -acfhlCTIpgPXKwcowbONm5UqZEHrsCZoCn8kF7YlYCh1Gc+P4ndmNCYN8jmlZVJaAKCtUPGxmYkY -CxY3IpJr8/lpVxH0K1hkOCki51PpHgCDLMof4Bxg2yDJjH5Ph47n0ofk8MpDI1GEQlKePxN4M6C+ -F50dKI1F3AuO3bNQTJLkMhDR1wfyC1PBNKSyaMBZ7RDCB7/nZ0xgbY/CABDQykyS9UTxUoIhSGIG -ZsbKdh1xqHqi5xgVLT1SMBm+aNIHQc/BMWM85NViB3g5dyibBVwfm6p1GPDSCndsbhXHK/K/OZhK -xBSRYvFZ46YiriZcRjReuTVS2gxM/8Q5i7q4gZHrROaMwpFYxKuT9ckPFNKFKJLqilaU73ZP5nTe -L+QPeslA4wiakSzjcp/oO/wY2Qom0ioYIYBew7Bw0FqUBB8XE0BKU2CINzmfUMoYuSznoq3jcsDi -8BMjukm3wPKxVG0vsVsor8EJdXYE+Yz0NqxVWZeBy5l6Yi87WevFprFD9MrYT2HtWF6buT/kC3rJ -RP6UVWcn9liQQkVKDjxNkYdvzCowgPAO5MR0elvCAtAQO0uxHqhT0CRGGjsjdVLh/7OWS08T5gB6 -0pi4oOAIOIcXiupLmSasrvzbgfZrxH51ju60teZvHDfc9Dtr4qtrLu9EKhvg4IOceM3B4sCuIL+T -YRY9uEdofPLyes9GG6H9/SC5dgSugMBwDIsS3kHCBXenVwA8jH9LOid5oKyAnqCTGHKqsSMx/9I0 -JldSI+gMi/wDaI7xhlS0icpur/Zh08jB4PHpU6w4d0aQQfxwXg+84mJZcbwXDUWcya4jFx2UA3L4 -oPMDmxt5YREOB5gabEkvxUOgtpF3IR9huJ8J3+WYXofOTRjrOA1gONCuJD2d+JDg2ctG8gja13PC -ItH57ER3BUoOBIq4B4XCziILD9oxigPjmMwHMviX4J/2ILfjfD0vkDzoz7TzHc4oyZ4jgwWf8VTu -hM6rcZCWUjWT1UHbuM6zReWmT7DOUZ+EftVMoaxzgmMFZm+AgE7HvNQojPU95wRT3WRy19EFipUL -D6gfRYVHlqubmDtF0jzINUJXd+CHKDHVyUJda83dYwBlfBiT33YM6PfgiIPOA48idTarB5OlJcXl -buABIlBa5NI42NXOsscFWIOBHopADPBCpJY7OD8noekjGjv4sCmbH5c6FVOFfUOrN2tURiDW2fZ1 -5EgbWUUhYwPXMvw4mmY5a/SHL+XQWfM3veSTiha5ERmXK4WOBoXZ8CGI/F7i9PDkdTew9njBe2Ir -p4G+Yacb6vWQeso368pPfloreM0PJJQDgXyZvOYHDhTgdMXd9p60Ro94AzAGU17bfuBjHyoWDmUQ -reIAMxJGuiTllOxN6HUCgbOschHO5D2VzSPD2lDlVoZgOEdJWhQlQR0muFOg1vhBq/+SVUf1mBjL -MFPmP3Q6ePMlLD4UbKAD0RKygQ8R3HJU2BiHiKeSFSNpbHD4OPYuwKSgHQFvEmnLSfjNIjlfiXMy -ORCRWTL2FVDhNe0wf3tkirM8A4mL3qbAnlFpANQYTtDjalHk74hkcho6gsm0sWRsGg== - - - oRpFLjbxqeLnI1f5ieSKguWXLVSqBIVsCOD/gEgFGSPx9CfmLCA1k/y8MNMIJCk6umMrIkp6HTnX -qAykFpjCoES2s+B1oXy4M0vEfJS/N5Lfk2rGUQDLePb4XnZm4tPOfyAzjABBA0rscAVygsTgmCfC -uBUL4Xt6ZLJUowUrehDUqo3sj8PlQO5w3v3OkUZELAtSYnZC7iU0bqJBwFLBEbzali8V6HGAYk3k -lwiEa3pJ+bDM2QuPD3pwSuGtvBBJVfZmKSQCZZeMa7JwI3nG51//cu57CTtilSGk8ZJgWMR5DTwa -otC4iUZPzghiQeSzkXDHUgdFoqvwQuMbnmu1gNt4Coy6gq0QOa+VrHJ41Ij1cGACG61AmTiofk4+ -t5C3WZaME2x1aBTIF56A6Bpp6DgeT+2nq9d5zn7NH6XqXlAnYOVNciTkO5aJhQcy8M4p7sD10ykW -5yzHPZOYwfhXqASR/bj8PLT8BHRwoA8Oid0tlEu9Mpafdm06oN8mqgNnKJniJYEghdUzEoUojKiB -mDp55L9nNkjMHtIIya+JXUf19iJRlhGzRyR6TVA8wAEj6jFsYIwM0RLj9LFSrU/AnVQkx5AhbZRy -2nBhHpMCMxNzSZwgpC4U7jJ0zjoChpwLlSkhM/IaElSio6C+kbJ6cC8PUqyN/RHn5FSROjnkFiVO -E2LLgB4P3MB/EzqQz2NLMTEK+tiBy9XhaMpNwxKhwEYgg5gummefcM4G9kXnBpBd8pJ0BGY3HzhM -QZYc8YZSaUSofN+TN3WQjH+68vL+IISgU98mKhcR/jR3yHA2Q6CSKYF+DH4Lch1HXGYj4f1hecK/ -IffMObmsyavvCcEe4aOg6k5ZSSErFs5OTwXpyBUlrufWI5pPvnzRhbwjOMSy2uEv4inCfkOoMGvp -iF8Rpe6YoKMpU7UZFB8ABeZ7sOgxFSqaQB7lxFp2ID5I2srtJz/5TqbqzcQdMJKTwcGOInixgAKI -fMfT4mS/JzLrKdPBUdjDSWUtV46u2Sc/9bgv2fzEnZCPDFjzAHCzZp1XNfnRKG/LetZJYSpiaXxP -XkqHo4wCPuwJJ9ctuaUQtVz56mfqzfptiLXFZUFZoaQsVz5aUXeM6TzgGYhEjTCwdsr3PIYekUQj -mwlEvnQejtRJT1S/cOYb2SPkH0DFB8OEVE5c36Mne4CZl9nMIoOB7iTKJrKBwdgIcNBmQBzdEnk8 -sTMinVeY3i0Dhlh/thSFgekz8rEYCaAPbdUQ8/5EakwQWmnyq3gKazjGbBgKLHkKjprAW3A2YJ8n -1GTU8OD8BISDCbsGY9mwQhrh7BoNu/ShWoGNkmxL8mJMhBSMA4M7KEAJsz1QTbZRXBK00daeAa4K -wWvy8UGp+8CxJivVQ8huvCEZg+OIX4ODVByQRlYVYkLvKUhNEU3IiH87JLl84QMZOJAO2BhVJyUS -Lk/qfO5zqfBGFmOEx3EUP+lAgEYU9PaJv0XUTKjnHOghz2D3D4QZYG5uGzjogI/zncCuTWAYbwgE -RjkIxI+SFwMBtQjUmHjNvueIf/Q86AbFZL/tTM63nzaiLShCeOcppfIlXXyUDkcjTzH83MQoLR+o -pR5maJRWQWX3gQ0YBFopkywLiNAagrzz6Eb1XgI1jgrs4RkKW9IYoFJGJDUYP0QBh0uJzUbm1iKM -kB/ZCUBBiCiX6qwHG/cMaVz/5AAx0hUDBM1gZCAaGkkZDO+p4ULdBjegp8gzodYI+Qqdw4/sBydQ -LXhwWB8Ywet6SlGTgYaelDYMNLkEEYymqjnQVSc+zAOOInJyITsnL0bMIJHLwDCCw3fXMcqmvhm2 -9gh2x8gwchAbjPwtaOQw1W3P6A3mxIG9BkQeor10SmPR597/N0V7iasXHka6ikkt87wc4RxCX5OU -HCNsLsehA6VCk+8+X04AsrJBODEaYecRofykXeIhPRfPAtqbfSNegEgJWc2B0al0F3zPwG1L2NfA -Xn3CQAYGviqSmy42CAiZxLjpGOFnBXAA1bMhYDTxSBswgTqQapIkBoqdUxu5uDR8sQQpUgI+RIJx -JyQjkFJsY/z2OYHGCQJEPl74pRI4tgT8TXdcYvgHA78Ng8cGjR9OTNG3iv1m6LWjZ4DEw07AQ2bg -DxkAVZKh7N//n7137bHrOLIFv19A/6HmDvpCbuiUdr4zp2cGEEu222h2W5BswsL0gKCLZYstvlCk -LLs/zG+fXGtF7rPPo4pVxSpSJM81bosnaj9zZ0bGY8UKCpIFPsqYJMEL/VeIS1RVPmdJMRAJVh8L -fE/56mr7HZImXYE6bYIksxNEmQQkgGCGwMFbLRxDBiE4yITrT+o9A0A9dkx+miDDv8A5Ibo4KHGB -s8LUDG6Me3vBeQgthhViQHgG42KywfCGBodzgqPvGLmLAaEjFW2ffSbkPRusF7YGP8rVAD8RbRb6 -jv+Aux+DrXhwrv6cDAUW1YNoFzh9wn1UKCksDXxzwO+4gcDTQnxjB8l9ImOCXjEQRMAHZOTdgRID -cBvYxxxtf8YGNIkWrMuYUcX9mQHPuKfTkiMZKhCDhNLgXl4hkr6LZxRU8iMh1tFfXn1yka+GCspV -eEuOBvIYpxwxQVEjdtTCaSUMb8yiQdsZ53cQl0sKQuMxK7PT5IlFXK4/jQMSMQI0hpcr2pi8jIFV -CYzPY8ohAIKIHECPULP9Kow3bl/2tgNye9UtZt0If3LRP6M9pfSi07KFfTrwL5Mwlamq3KaickA4 -s0llGiCbBCfvNpYHO3cwHAhk2u60T2cAR7qmxgjwo4O1IajhF6pGaBPgAeHBZbSRqYJqNhRv77zC -ye2afywwZVyKT/2Mm7kAmxEAl5QZG2FcHu30YP4+4EGRgL1iUSYAMZExxqBR72xf+Z35nOjAw5FH -dKyOzuf9qzdxRTPmunKm9b1lm/4xcusTo/6JmeXu8UVx8PkwkDDEBbtkjiHLFyeFSBMdH9rFpCKc -2mS4hGgpefbrYqIFky2zmAFxN+2Llivpmo1Oxqm4bBlxLUY6S+pL6Fh7JjJINqYRiTZT7gIGOQHe -xMCjyV0GthjAJ+xC2+PzrmIbnMLM9noZFoZn4GaJkAWi+it604H0lQSUP1AGlZQ72frjkRbTF8H1 -ssBYG1e+3UWyP4MbVXeHDrFU+Jg1zjEcALybFSwkdGweMMMV05SBz8lda/vCt/sploXPf7xOLfDN -yiSfvjh/8vjowdnp6xfnR988Ov3xSH9j4eQ/q3LSLSonc2MsEHQfyesfcKDJXAGT75rcCaXaft0m -cZz0r1T7dlpgmzSUk/ijhkUWiNNqRAI1Z1VX4IRqKptv6x2iicemOQu8Q5JgvDZLXkuCDDNORPUd -PzNSAIgcNNT/BDuM3lpjEbMEo3NWf0pkqSD0QoOXYjESN3mBbGGaEnzfmpa1rEGa/v2opFhJRXCH -uwf880g8fKCicCj3Q0T5lMax0sQOPhkc/Nzko1ISAc3Og1YdkiA7Mjd5FjoPO32uCpvr8ghcw9xx -1SQpa05n69DbhUkpEUhIbOrQkTnhNxtzOcRljUkWISjW9tH5qWyINFUA/+EfNIG6GS9oazhXBuqw -OGpM9lYrzIMQc0L8YEGBAtB4WSAC6OcGbEhXnygSQafJVesXDkct6w00owhiEhwYN4IsIrI9VRtN -SOBrQqLXbUbIREkRPS4mADL1gMxyv9S8A60YixpXtW+pkV0uEaIUL8OqTwiBJbCtsoKXOO8IYEBa -V9Sqvh4hgpSttIok611WBkQXGDDArWDnws6GMuWnc1EhsFNpPGrl6NUlAhto/0CJD6CwHGLNhM0C -uuSMdDkPuAIRTCzMlEHriOJq7C3ALIpDWV5Tq8+IWU9ctVNtamZRMRKBWLBI7IIwCrCyCUghgcFQ -WOKZnvTWhhcJsww3rTWiroW+RnK/FeF4T61HQunXxHIVTf4k2HDXDq4xcYRGpUd9EowJzKAFLthl -LHRAsIE9A1oykDUE+GwQVAWWMT9pOfXHER454k59nTnErBPcP8AOJzJ9QesNyFPWHIWQtaiUgJlY -khxNguGnpMZxw+IKMC1xxLsRbCKLvtV7kSIWSVpHrJlRrBB4TbbqKj4qVToDZwJQoIKZ6JoEw8Jb -SS0Hs7B17BE0jthWnIC6+Jbs9EBwNyGB+LoqW4Ws27uSkVLaJJmSoNRognqLlEylzfhggvz52qHq -RMIgOIJElQH8A69dYxo1NGTLATIIQrrMhDUXO9GHLAuvqGc0hGagwZsIGmh1xyAZMz6iRcJPBQB0 -jSn8wNw9R2tiBdykVCPWGfmvsfew6N7eJ01M3FeB+FYCAUiNsEIFHRqQ7+W1iZenRoCWIAqEXJ6r -xt0PAxMsJICcG+w+fEE/qZKeOLMGlBXAVPiaQtsEfnnWerNtMe6G7FGwCk0aXBASBGvvF1Hh6TjJ -mwLgHB+sfXYePhUusE3k8qrs+akSH7yoQwH7pKL17g5FO0TpaIZFMlQCMnnBIhz8bo4ZX8YSqgp7 -HVJjAPnhhtF4wyEUdB89x/XsE6uWIAjRVBALrGg2O0NleJaeHEHgA1tceuWOE6JTmLN962awjKdN -Un6YDPLcsO8Rz4qBbcUkwEdJ4rNe0IqQIbQS9mbrxAVTuqjr5yMA7QSUwKlObBLRmsf2HPgAQQ5X -InQyURAVZ6OsTDqI2zv9cUEtMis2uwTQPYwKKyWqnhLeMbuZYpVx/4Akcy9sFnBEhT1p9SaUwhmf -exdSYUKo7bFLQJ/TJZMqThEjoKqEJJtyTkXpA8hUj5+K3BRKMp/TyWPonxNX5gt2IYBrFDLsjHxL -1brKxAfkoowP32/s/BAmr52H2FFKpOWcApmQdE9OA0M+CZyIiE2rUgKKJSHg6fFlpmCNZQotp24F -emZ8aJ5khCHTUfXWDSVb5KdoFa5QVIXNCUFNaA2bY75vlYwScUIXJCgZCXXy1FF+0adc8dp0OU08 -8l+OXBmKEBq9XonSBggK99fplwXJvVk1kRSIsD9LcIqzMb1Dw5KRZKv9qegu7sy9zbJRqzeYfQQk -qA9ddardwBsk9EMtVZk4e6s+JRNk7D/D9YXcB27OT6GC/QYBEaK2TLn2Sl6v0tZVfMlSu4j802NG -ea9aq0JW0bYWMnZOQpFZy3YQvgIrWfuUL1mFtZxS8CknypTIQmqxRHTMUr1vktlyVFUoyTtFJUnh -HrCRD2rVgOhqXjQXfF4Yci3I6DrV+LFmt3UrUdFNdDMBK1rVIENnsrChZZrJp0KBF6hduDRRSdFu -kPQv1dczuRxQnIXCiNK0fk7kkIJlrbq5ajYiPVQBybW+uOwwXhrRvApB9KkFfpmmy7F3Li5SmiAS -EBCdCYEf65GpDM8rT8IDTQyU1hEIDuxd7jF63D5o0HkUwEBlRMN9sYQFKwrustoyNy7yYBE0osLR -7LnR6gA4AoBBjBxC70Q84M9lrgUMatPAVQmvi1hBfNaqwhhsezB8alaA85R0eqGv9g== - - - o2qdHmBUR5DpGvkNay8q35ZG4YlK29jmL1ANITHIlnTWBQLWks/8Te1xyjOm7rdyyLBO8RvBgxpk -cqIupVt8eAjGp3UT7jnzcyXAHiJ+R0ZOvJUeVJTaAAuW1FoWkwQxIm91t/3d2dr4lKgz1gF2EamC -jJqmVj0VomF9866F9FdAtqFyEzy1WRB+mmMZdyTID8XbWNR4C5sc/Yy+cYCGXKoaiPZEjZJLVXEc -ulci1F8GKx1jdaUKXcC3iDhBtHFN04I6VSWCKHqa8JhRKB+YGg1vkRmVIz9O6WPIhRCsiJ/6HKu9 -Cu7ArDwd0z5COVo81otG55SZf3qF2EqRNUJWAT5tYjccpyyDIsGk9FGSwaOlGRO2lTdhdnISM0kO -qtzGb2sZnoMKXRJgFH12ZDDpRCZB++jiV6n8yYS5vGZ6/rBnoJQBYsB+nZyc5L/xEBISpCg7KDUR -ACKZglw7LR/lTdgB55T5/q7QApMiQFVEGrV8YtqoqDkDoxESNFXVZVhXGEHu1561nXRAEn0UohnB -XIiyYmIpTomtpMsAEh+EhjBTHDiPjcnRqXAJIA8nO9GxuzqHGMsK3oFnATdR7ogbliqosNVzRuHQ -opNn4Ji54G9W8cPQ6s/EUjytfVjRMESxW8q+Vrk9Uqryj+CHsA6NzuOJKgxgYFCUeIhqz4O9Bvwg -lWY35avhXTvMS6MzagaERpKF8SCMMpg0rd0jJgbcRWDbGthRgSAkTwpsW8+iwkCOBAbqOfeYACXd -YzMSp4nF8o63MeYBBCUSB5AAKO5OyEsic4OJRFqDwkKudsxCxMh3AdEUPHhzCWnChMqPQQcKMQhU -4YEfg2QrcJVh+DcrXqSCrE7DXI1igNWRwVKw3jQQ+JmMj0DeLfF9DBuQ9AkY+VAJ65PxiAhMxNq0 -GrI8ycEEZIXgKywZWIZIvtEpz5YWJPNSNEs4ws2mbCIwKkeBgqK50atsxFHDHOK9gF4I5C4Q8VpG -2Kjvf3hkxkew+DI+PTIUYsOAjPsN7IAsk7dmobxBlUxBAvNqUPM+nVQRZKCuYzo6VbZSou4DxQht -ZLDpg9jBvi1EnpcRhBmtg/uGQIEvJkBBP75vK27Y2gwpUBbJwkgTlXEa1ODTNzOsOHR1M5ax/n5r -Xm+LqnBLQ6SL8RFC4huD6kr8oiEiwivAsUSF+CaKKnlvSAoGWwlZG3j9FdSyVjoOBp9iJOOZBiSm -UGPDPuO4VV0RzELoQ2+xy1OUaNSG2BBjakgGI93OYlr0gJz7cyGoleRAVtT2FY4lOb7YcwlIY/NS -mL+L4sxIqmWBXug+DkTmhKiUFYeAb4e49+4CRTVfNG3UDR+KSGMBfw7BAs6MxraatCvI1JGGbiEh -K56VY8sF5VFCyeJichoUFnOTIeeEBex9w22sHYaDgXRXN19IBYAUJgIs4AoORhd7SkXMaCBErrLg -ipsffweq8u5AiE1gVKUiysXnYIAwK+wBpAV0PKYAmaSq3MxTguhJbRsNV++9YkeAjaHZJjmHAoFV -LEiQIQC/A4409l1EJbHCqRUncrWIAZcGnnY6FPpXYtE4KQhiqFyLQ0lMiJLyOxZxWBhfQDQOe/wm -7/EkMimcghXHBuDKMQBT0CaS4TBCiLg4rChVfjTpJi1mOmKnApfDwMcEAz4H1CbYiII9e2QxAAew -oSz0VNld2KmoowPYiZGWygp8YjIjyy9YtMva51MxZQAhFJhsatBTpVmxZaIepfFMI9m4NSz+xuZw -xOdNrMSrQk3AUinkrgpROxfcMURoUIABJZ1sO2BNbyaviC+JpcNje0Cwm5xnVbZ5CmszBO3dcAkh -8smMfUrYGGd5HKRM1u4W+IMmMri+4Tb8bmYbMHCC3TCKaRE6DY5OVLdABFqmKehnHuQltAC5k+Nm -TQT8QOdgfBOpoRO/ptyVZAkhYkpAjDLJ7sAgwuxMk+q08PeiLoGwxlzmKTSX8SbYgDBlkgy9WhJv -kqyCC7ww0MLRGECyZQ+CFZlm5pjzTNh9Kqwry2MRle9qCnbuZM0Ikk5h+NQrBnFKlAQRt6z8zE5E -g6AGtZpD7KYwwvK6BKmZNW6dARGYywRudB8El8IyzNHKtmAxnRAjOCGsAjw4CQzA+jcROGula4TI -MCbfp6qte2CREvGpVs6EXToResr4Ac8yYk0Y1krEReggx4PUJJlbOYJHgdR8FHTPmWn75owoix+C -YABLWQPmCmMDryFLA9saYlegfsi2NsliJ9B7JOEjFjCRxM5q3KssSyDlGfA8JdkTCZgCw0eBypP4 -mmx1F1i3pGTCTm6k6ygLoLs/KdLiLfawQpYE9SmMVTt2i0aARHzwTu7nqhLhwJJsZtZQCEokLhPe -uG4l91awmiWxgaIQLVurD+bQyMZj1VFw5hCJnrwfij3GKs4ZRf+aNSxEKJTFmQ10gVkChOdO1P4k -O2NTxYp05h8K3BFYWkz7iWaFNnYE4d0AgLDFSkU0WbYHjSuy603GshYV5sVuFqJKusiWhcR9of1r -XfBIyBHCOg5/Iiq/6DmEaHKN+r3IoB+KL/FWiftE4FUs+YwiaWaxIUJ8GO9LShxnG06wLw3B6LiB -FAXpadBemg+IXJjK8tCCWvE0Bn9U09WINGVICBV7SfUGhBaiABBAKJSfW61oJB+3rDFnpjerTxuP -N8pGOC3EwFRC1oj9yeLUgJmamsXI4IIHvXRh5ApbnQBZhOmxHiMyXezFm6MQjFGPweIptHC6W6Be -2cTFQ/mLmSfPg+nVY5upHiTbYZX63Azck3hSZs81FohbjQZqw5xIVhiigvuY2BTJ8gyRWrzaR1Ls -D6sVwV4CWEgXwu4r+kywQQI6KTilUm03wFadjN+F8cIgy1Rjgag+DBZvaDUCjHQWWU1UX9hl2N6b -M0QbDb2SnR4XOoCFlrDghFdQqIGWazZQF0KWQPtanXfms5i2cROngudWHKwIfKVkrphWsEeyJLEq -nhmDfAZMM4KtCFaNPMtTwxGbytA6vqF8kaiwD+YYWQ+jxQWRZ2ZRRDK1iNU0VABkoRJ11jepyNDF -5JpW3GQAchsFKjf4C4ANt6Jpipgswx2Fy1RFbNp0o2inGkE9ID4uSeC9hLwJdl3gnFYoho2ynYB5 -ZF9y0YQ1MqbxkZE5QHuHhJ3BV8OlC+QKvy1GzWwGQoCErUzVI+GKMFEb/FZxLoQFfHkKUpksoXUW -nmX6UNDlWsRI1CwZV4LRPmaLzuIYojAiPXOPO+Wm6KwaGJ0Q4lr4iRn5ysQoGpTaWlJkq51bDSYj -RbqYsEchKFxMlLbExkqnNoiSxb8JPotqcMhoaF7UIlcdJKYx1ENCbTPGxtwKg8/ezuoOFpGXfQb1 -6cqw2kSIggwNRqnIHAzTaWqGLc5J+k6bNIJvSVorsr4eVTy6dxxIahhOTsBPR4WGeNfEaMDxzKRH -WiJwfzEqqHmh/RbsWIgEYqI04gG9ylETklS0jIq3XALTcYjvHLNfV0LHpoASxszcMe6T6P26yVAU -CNdFda8i+QOmBOKhiIIxiSIiHifWGLisUVFfWOrorIWQb3IsfgYkoRZD3jd7N5wCq6kZfwBqsBAl -d7adkyi3JoMsuDijUBCyLtzftTUwewTDmal0jHWpxs0MoIXaqhTTn97qh0pRREEETU0gKbE6pdm3 -KEV11hAlHSO4DARYFcWyJWvfoqRjbVtkxwyE6zP0y5IbzCcUE8BnIKVlE8NuzpbcRdEBfKjs1N+E -RREkS8XnYm2PVx00VUawDLgZrkZ4nuTlxShYEyjPmhm/9PlQWwDnk65TFLE7zc8UlQwlS47tKplF -AkojEeGTk8x+XIVKGg8/nmSEzIFuZ+ANuSaAoLI13GYBF1ykbNRTKxK4GbIraw+H74Zvgt/OyixY -JE1BqSYQeQGpd63bILV2BvEDtkZ2DoD3UQxwF4Lyz6fUQ8LIQ4YNAQJm3IPFyHMxRQ5BUhF3HhMW -nyUlXZoneUWvxI+LAIm+XKG75Km7FD1ggXMuhtFj6VrjzURZGwxmgTQxKrZIR5TkiJXINAm+Dr1Q -FnkYzp/QBZTSIFyLvCC17FDtSVlJpk/LZAgvpBcRAqWaxq0SNK843ZFAJj1S8sqeMT/HhLklumqw -0sgU50KpCp2ZDQ+AorQ26mRQbQmDqxnuHOHNaNGxFmW6IzXOSFULVqSFtDWiNc3L4kZWnEHnU8Ij -lYmHKgKssg6cXDFK4Fq1OpGy9KJiqRaAhIxkELXob6s6iWIPr9CmakdorlSjUKcMAeFqnxh3Qmah -juq8LqA3jZOSTfiS5fjXYAu2GB1a9WaClHA8bKSuuYjjWKHKh2opKh7DVwdap3hbE2VNO1ecsRYg -64WFjKorduuAQsVk3oGznlyGDUY6qG/t05VR2sDhrkbvBsdESxGDO4QEMmXNLQqwixIDAvVHCWOa -zsIWJ3ZeCM1OZM7XaYlQQvwzJABvQVBUqbX7EJcWuF73RRHOa5m8gYSXPZMoNka/6Crh9+SUA4Jd -jZBQFB8jQyInNGkZW8MpVV2KGDgqPCpG6W7wW8si7lNt+8a3+vnapKzkyjnz5Z+Z0JmQBeeEH9MH -gQT7YZsG6NNZtuJEJ9LSoRA76X0JWfxMYf8sG6fSONx9ilt9SRavVobOo+iJnw1hHcIkpktOS0lc -NgkgtKQfq8I+sHHluBqyr/dNWNw4d1KBKMtJJQl2tY3HuN23ZG8UoB1AJIP590wwqK4WIu+JTQZY -E8xFx9BtZFMaaH9XDUmrBRdRu+4I7mMcBRJfs1BtTKOdCKViwiKCH+FW2JazHRv9ABoDlUYYHcFr -pwY9I09RtNAtG4aQTJdAIS/eP+YEHAPmxqfFJ/SSCb1K7G0xyaTyzr7VCuHM0OiJ0MuE4ELISDXh -y5HUDFVwN0eyoUxYIHN+0K4EqiYi9ZgpWBF2BRzbhNysE0g0w3ogetiYhZmZJOiBkOKsSnw2bO4b -qGlxL7/xyI3oxImhcQDZY491REXYixVgwSkb0BuEBIncKUAXN+NyxOEsGgEGiLQ9ALA5wfeYrHpg -eU5kFoBmWxMssKvFFEUOJQDQJDh0KAOGB+8BZQfROHEAdU0oxBO0OtFFBskbOfmaIRWJ/4bx0LII -kPj0EXBjYPWMiUbNn/j00RoQwbQlvBQpozEfAGUCeC4OwBMCklPQ7FZBD9lcnc1TVPCQIRE6DBLm -Ik8MZRuqoY3pB4J5mFU33ioLCENNhBYnoQnsRIKYKeTK8BwlSUjJ9EAJyb4FOUKcLVctNCjh0+IX -rfbO+IvFfvCSvpByPMlloGnLHrb4LGqCZWAd4Ijp3/NELEuibycZ9JIYeJkSfB/kY+EPo2yAxBC8 -vri5JqvJ9PSVHasWrDqV5LYwM7vMKEoi8RItq6CKMQcUjrUkivtTgcS6/iqYM8x+q2+FoylIsxp+ -Pp2/ZojmUzKvFGaABe8ki0qcNJOnoOwNivrhAmCyJyOBjXiNsgT6ezi4nC8MlcNpZg== - - - TBq6iQQ4p0KlkdEG+lDY/6IYkyPzcmOYOgltEcyc4yYwyVVknUkYPebBEws4MouzGff1UdrKj2hn -kYUKPRdJOor5zF2BeASnqdgmElh2NTypIQF7COQglclWrEZoXYR/bk7rr7E8CTUZGnLYIliQjhXC -5ACtDO459rXKM4ZYpGFxdFUbySLdzgmBGECQi0Ib52d8AZVvEImoQAiAZGN6IIOxuynd7p4XvZZ7 -dWrd8EwyR3gl7E+WPgOx5IgLo3USSStJ3Bf5CDgCTkGb6lRedV8ytq3DiTGqNxbz6LgyscH4iN3i -xN0REjnR3fvwMjLBPAOeEAEC/CYmZPuRb3VAgM+jO4LycWgX1K55K6hAaysEkKvRCYAVkZ7GA5aO -qRI5G4QDwDy5I4lcnjyoWScVsAVgl2peZt4KQQuEiupklU4pM+4Jo9CrhRDmBiuQ22h0UpxW/QMe -NLEAM4vfrtliEs65rzk4L5m+I6MBp3wY3AhNc5CSJsoyE6gDqgDCJRMdW+svB3gw8T9ARsMgHS9B -o4VojjImf51L8SBj2CFVcS5nMV9KAFgnoweTcDI5iMkhZyvmQT8MoN3vi9+HNWcMyCHK4C3FhSY+ -WKPfMwRJeAxBN6xUzaK/Jp4d30McCGThhoxOP/r5sOQrqckyGQYil59VfZ/w/q4h0IwrYdgFEjT4 -fLP+hMGirSj9qvI5GQGybD75BRjwqeoRdcKiPAtYFbV7Qk0e35Rhf4D7rCJArMwTLR1W/LGvhT08 -BM3oQgjYooCEHUVRAt3L8cVgtcFQgICLOhhjFFg9q3UNHPAugA2ZAsCXDsJeEBVBxDTwHN+rJU9l -VyIj20O83+goyDievExpCEhRfcL0sBK9wmEQ3AZDiQgy8ZTjs+v5mCY8UTZpYltOtaFmzwTrPchq -zQfMIBNqzi6cibgOBrmReIL9Svh8Ffiee+EpSTC55TEMaJ2R6rrrBGIb37PgJ6srzUgPIJTpjC4X -E1NMwE7NK1lqErJRtYt+KxlDs9HnNIG+T4mS6Y6TZzATGWHkecRYgoAcwG3I6cQou4Or4ERtZLLZ -IiStRWiNWgQoMIZCEjP7ssmy8MKQeasWQtC5L7HqxF3ClhEwAipiWQohM4BQkzW+qvy7QjxZnH7I -+jMgV62AMjB+EmZFnY36+IQ3IjY2W8Ab97YS7aoG14AYQ1UC3gIQA+PJhJzPJT8IcTHb7LX8kZIA -eM1N8onyJBIvoH8BIDoluJjVE0AnEqI2qQQjiNw9W+M2EPc4a74FRikfjwQMdoz3R85Yxzoc3oaR -NrDgjdZqmVXJ4v5kcVhGOszwAs0EVg3CMj8pAsgmkjmSro6/xa8n/kwIciV5HkmJT3gnMTzjcaDv -nDZv5G6hoeiSAJxsqTFoW2hdYJUQ3apG+IT0Jva70iwjiEJZq/UoVa4ujFQyZwA9zfXBfliRpjGm -E2MQICdF1Ltk8dyqYnU0piVaSF3CEotrCrUzzDrzgUpSooUJNYREy8hqNfrGcXTd5eLBxTnDgxFN -OZH/mTJuzSnzy0ECVxOVXbNUU7EuukBOMK2l+C1BYkgo0t9h4XJVkpkRJVbysEmakz19ShqhIoiD -FxsaFH8aVmxUHnCqqqac6ojZ25A5hYyzG7R2QQoXm7F6gUXVvpjKnLw8T2Q2RsOCpP31e+XNWxLj -mZpvZWPYRQ8AJEFQmxea9AHXiF2XKFzIMGug25uR59GziXTsdS8CZU6Eo1JfEECrPEFkXllKI/Z7 -QAzYFJzaALWmraGkpsYg/HxI81ZnYYUsM5eEY1kVjp4ZlokoFxCFIXcX1mq3qbwOomxgaHpR93mV -NDkhRgiOAerauhY1ddhBw5GmQmrms0/VB4/t61jrKNB1ZToRdhmKHbCj88XJkmSpc9Jo8SRac4D5 -caPK1kQLKEOaknCSnPgxgC2uarU0RWs/I3wPLH7A1tlZRRnSwHSxcljSDY1xhEY0VuJ7VlGJfa9P -GpIV4qKwFuArIZsGOSDqT2q2rKFR4WYYEhrFYPgxuuAMJWTCKn0h8AX1YDPWIEzW0VnNyNAimzoi -aa4hF69bNYVdTgnMmUJUPpLqHhgDpTWLjCK0nape/fnoquIzH1vPIqBMGDwE0NpoPET6EuRYQFES -ZAajlVkUXAZK5VRhO9rGVtzIbw8WykaepCYoFnRetBOg1pOYX4nzQLPIoD6dqixmoUYk5jJGC5WA -rxMxd9JLep3FZnGeH5zhDmYKHXHQav+YWbooJC0c/O/lLPaZR9QYN08yD6B+B2WwbHQYm/j6WQsw -GUgcwC0EZdG018nAx3aFcAgUPa4cCQFg2wJqXDb2AzcA8uTFlmX32LjNiKyfQQ1s7ARMGCKQZW2t -KsHO8hM2+SpZGAUmw0/li7OaYkVydOp6NDVj0hNdK40OELQG3PwIgD1V9bOQbsEeg5JJAsV73LBf -A6edFXfjxyQyV1FZkDaJxYSwC+kaAWroRAE7au5QwkMYBkwLtmdHlFQ9PMlsK7LcOrEiBaKxl68m -grn1aI5G8wrlDsY82UVM6cCaUaeQcblTgMic+r8C/cHXnCm1MT70EaBZLF5rWI8TUv5M4i0NhsBE -zI+jB/oH7mZAoQSGSZKZIliH8LIseEOomTezi6BDECUR5ztx4IxEChVUIIDgPomYGDuANI0tm88h -gjgJq5NGBySYd1ZLTzQMmlcgEwUVSXAHNRPelEshN4PB6+2rYVYQDGGtNNsQBXbiZSqBeC0tPMyM -ZMjACvOYHeNq0VVgtaDKaVKXjmTIWGfFLrDpOTMR1Y41qJMHC5WKwjhU8taEEjD9rParrLBCnA7R -PUwbzsE2xgr0woanJTqECXDDeWHVTuri6thKSb0m9GHYp15aVPinYJxoELjEOVUHUgjYzEnazyn2 -KXzvilHbTBNZ4MZghFg6qQaz4wNjwmAsTeJcZi3nA3VApocQmFslQDRMIu+Xq/RAKFIUZ0BGiCCo -edj3NBkZDOn8NQWDValBUSRB0QSB8k54/xW7N2X1gCGmrNgyO2XbGTXeRMIakxkUC1Hg2KyuicCM -2KZsaMTAMGhQJ1wwmaI3lnciDWPlPxgkE20Leh3JNneG/mlZI8sCw9UZKT/shZzckVDl3tDIpKvA -+KH1XVP7iMQRTXKNaGLJenesh5AdNgH2MTHaFlmLhjugCWgkGJmgQhWnqj1EQ2iskakLujPaHhaN -b8xo9ysJsOEMA0iCxOpoYQOsMjgCAi0RXRP2NNvWwDYJWbUE2fjzH5DrnTYOLFT8lzU7Dm0txByO -qDwqpZNRvZ8IOurI1CPzkeEN1OBLbZGIFqHbRneEE4X8sRkLqLHQOAWtc5bfaMmmYKwVTqlPwC5g -YxL+6fj2bJhKKgF1xUxWEoEqRURlYHdDCft1c2z4Uehxix0NoCe4Xqi79EYUCPZCzHu49ZPQ3YC/ -ISXAzb//F4TRNbB7MEELwOkXr3I8I6bBlg7iKHYhDkWk2Y6Tlrrve6H7rQteVsUlocwAsbICky3C -edFkABQARlRERWwKCElxhuce6AaVL6oOvHIxKQvQww7kRcGcRsgdWkLRuCQ3FDpRQJ9/z++Umlp1 -0vlFwUCLMjKsa/BEjii2N8dkZP85VKdElfp/T1RrQP3JaKeBGps2sUsnEjXfc5I5FKsTgIlqbTGc -IjqiJngEeAAMK04OVL+2QAQ/N1PgeoOaFbIbS2CTbhnv1nOYTZpjmctK8bVQvTFaI6MNK5s5k2HL -ILxsk4QKFq5ILD8ybNIB02pTIUG0sp4qbRGtyzLQxUGNlEnUcjL6YtDHolkbnWxsLAgU9TzgiFKh -RDPDWX/kaY4TJ4a70OvIKr0/FUIZaSfUlQKqDXtiYmkQc8RI5KBMHioHpVanLPFmM1bcF4FX9n8j -0JrWBj4wMLt0Ov1cK4y4H+fwaApW2feP4DLHIJpakha5sNhlAccKxgvr2AObNROk4FLlitrUCNSC -DT8hMgMRuCCT2G/QXa5ahxo+hBfQV/srB5ldq9XLps8hfmB+UAAnQyLUW0k6KAxEeEJSZskZcWiw -CvTveQgR5GkQCFkBZlZDSmfLFlQ5FulqCIpNLHhTix61QUK5SLRWyT6keZad8rlTtJpIdqZDOVFm -GSW+KheHqryYXD5hUYS6TFiBtyr42JiCIV38hmr2ZV3nbDh8EssXdqwidJfMUAAuAGVXnaqQZB80 -ImP50iLHaHx5jxAda5TpSfTZA3rs0cR4NTqoMlSCUYebVWRd9M1gcFR4O4mIabIzogylDbbN4Oc2 -0dn6ZhAD6idWjlsMKStzhAckkg9mwsQGbbRzT0Q55rFPAzJArm/oc89jhDqBxpk4Ht4Ipci8w8ET -cC2yWQ+0OTuSAbhG8GiZZq58cNthheai2C9yQOQvzJbUQuiSFOqJEC88WbFeTVmNJ+HWIr8DYo9k -35OyII2IuB+CrHbchGmJ6nxW72YjYgC+kBmAXFW1k4JwSCeqoyZLHUoySaOCS6qsS70AEHyKqkEv -acBOGHNm9UZT/k71jN5A79ALXl2LaXkytY7p5wnnUv1zyIpyx7mRZNImC43qjLGtiUiUcQUaxczC -MQDO0g9m4wsTkzEY0G8wnIMXGrQN34tIhyzWrNpkOfYkSgpEMbDZ80KRvEeoL1Eol4YAS+kmrXyI -aDuBKn8KokonJ0LMoz2GASKhwtvASRR1VY8WQFe0XeWPtCYVARMPQolxuMcsHI0WyOZ6QI4izsAy -+qjxKBq7Os5CRNesPy/KG7yDYHS2ilBWmWhQUv3Lwy1sCsCcDEFlfUhZ0TnSfQjRoMNEbBrUE8FU -UAzDY6y7iyVihoEAPzFaCzWS9oCMwKnJLLek71W6pOCaMwr4qlQnOcRLWVPcRItAnyizQv8kDhwQ -sQ+uauIquptZoIV3csGiMIipqUOEZmpkV1pWk7L9hzrdZGYPkakiJzH0ZyENBrPClVkUNqlitIL+ -rOIOydqcjq7YydCIwLqBVThZaBche+ugjuIDlTwRocNwPYeMYSzcP1nn9xMr80IQcLB4rIygPFvT -mwecApnZUlKDTQp80wMAoQhLw9A/GOmMZE3SudSMoSKnY/b5gQ2FsDkqTWHHwoAmPI0FHSzNg8+J -gm/WbmC5Y3yKEgPGuwMRHDGKQPSB6tNJZCxIeQP7CZB/juoiyFPcpCMUB0WqMrFiRUBONCkvVXQu -RRF0pJ6mKG4VpM9hcSdmV0IozBZ1B0d5nqK5C0IKBEQyfWIwCExTfyDetSmTiewEQqnJ8LOE7HVz -DjFCdg0koAjlQuaCADwWIknwVQkO/q2JqSFMsWDBZAT+JiXfgwFGWLGDHoqMuRPxzvbCmE5IUbN6 -J42ipm5Hs/eNOnihDMtKVnRxNkRISXga5ZPUu9JUVyJxB/P0jOmIjI45alLMypkiHBBbD7bnxN4m -mSy0Yy4koHNZjEHXLEUZQ9zTJpaEd+ef1RuMbJ2wahydoJntgROHz2aUuJYgwLeOzA== - - - rMARYTWZIwcQ0ZC0Tz2LRopRVkA3RstfJRr6KaHmucnYY8PlrpxLYaM0WthFEAlQn1lqlVsVqlea -EkaAfLFlRlEtabDiv5JUJfM9P1xffYFXQeIbBC0kLDNDSm4N7aFSrCrQy3bFgGBXJuuKDAbWKSiA -NNcToK4MUV/24Uiqo2fY3pFWmEPGxRLQSrVa4gyuLWAe2TiqJqm5FqSGZNk3sL80q0sD0YsjMISJ -QOSKhPwfRfXsE+WOiBNpOqDPDZxQxYrVvUpCWJyBs3EEXD3wNrO/ZhZ/YZuExXjAQ4i9bE5eLdB8 -3eHnVbz4uxCVbZa4PGHNNCOZzSqVYPciJFrbXBLi5XziwZzaepI+oAWpXOIWG1mERyTfB1UNtyIa -KO/F89qq8pJ+EqKgrQl8EYMUqtNpFVeDapLpEJoOBAdQCA25VIsCZyWW60z6S2IKJ5ZBBd+D9YQv -qIQgIqE7hXB2i3LfjCKy3qe6NX4ukj6SgCHFvS3IUJrZQtGaswG2g9CCTlrI1FkgkbCjVFXKUICj -KfDjVoElJCULfQg7gk4C0qlRdfETC9yKkfAPEwF6v1gxMZtAYq8AN2IIQnkC0pvZZMPadPUhQAkY -Cy115UiMDWsfq9mTDKMT/0MXYsUl6UmVgAJrjmpFcR1ZwsgTs6KlEsj0pfHCNtq4g7HA8USYRPD2 -QJOqpT08enUbI37VTJaC9Z4tFc76O7CmoUUK/II5I41wkDcKQ0fUOETsuIMkBVMCxBT1Zcr0DmpC -W9WVs8CdEz4pBkN8YfgU1A8YQxa9AfXtlMhWYV+mP0nEB0vc7b1oskJ9ZmMGhl2JGpxYzQeCxi7K -EnKQiZPhjZxxWpOwHbtQMyxsEJFANpdEQBa1vmF0/oHw2Ixf4HmCdQ+iBVJsCAx12TeZqgdIgsRE -OLklCxHFrvZJFJkEZp3oLJIHFcMgQcBSapb3IGZPcHtsWknZj7NYeYpyoZRUXEj8SsmaKvbUKeem -ZUCUdxVAEwVRwdDhxFQRFJnKMPZFx8jsAm1/mNngsmwKn7NVFhKwpQolQPg4PiAxhc46LsGEqhZO -OtFZ0wBXkopVGXnqDBbG89IESvGZnfVpYyS8VLnDqNZ0kUt7aPi5K1dFUM56e/VPGaBt6aiGLLhR -i2vnFpEx0LC2bFZ7zKpzhIA5YBC2YCIB3jjIvpjyj9oc2LAu0SEj76SI6lnpIILDXIyENiqeV5OB -vhOJ5xzhidHSukWfAX3S1vVPpQoDybSoqSXUvcEYoFuYxNQK1ksobYLSENmqxlYlnG8lUSYrBE90 -FrHGVRFHAtCiauFmDYHQKEBE0PmsEEDY34gZCY3FrcgYBzSVZe7YAKm745CRTjVax0vUwoXhyiaR -jYHSkelWRPrA4FCj5VOZ8EdZbxB/Pq9cjAM2qlUALtOyyCkTeWRhPgK0NVQ3HhimMc6gwx5ZxUfu -SDYVfmADGIDdjVaNRBK5ovuo4CAxjIsiQ2+LD1FrANdhPZFWjLFwbnXsIvXAjgG/HdYelzXw+jDK -kElQIS8ZZQCwseCpOM1c1rbqFWJg21tYkN2v1YWj8JAwVHmE6uGtxeH3ilSQ+DSLSkN4S+C4iPxt -dhaxp02x1vFSKOfMzAEJH51rpPlPWmVeugozD3eIiEJEa6G9UHIrXraqTAIAmN7WZ2ikxczGhsuZ -DEqLnAQLwNfr+zWxqNHqh8n4jC2K5I2YpWq+QZUiCAC0D1YLimSovU4VgGJagr0vWLZcRG3IGhJf -iUhhe2SC0RlMGYGryjoZUh2qtHMyYmq+4grlmrmImJo5CZxXJy04UmGzbyDgYcxOQi05dflekRo4 -iAZaEw1PT7I6Ut7zBSezzZaVQGUYbMFb0WM2XnoA/pkKeaDwnmcadVL1MGHWWB6sOoCn+L2OYvEM -UhSockDYDY5YKyphIAcQwmyqBfJNhQcgMKQfgmetVhoPIWx1yDIRxRDAWucbifZQ8WVnAcQTnRXw -FR0b3ThjR+SzIzrOuBXmBUOeCPlOk1FdRyPcJ505QeGBxMnOWd4L8PPWDV2WNZWBYMDl4WLg8ird -xpUii2SSeMq+t8snN1i5i8ArzACAEV8teWDTcBTSQLUT4VKLSsOoHyAhYbLTThX4WMyukjC+WjyW -rIdWwgbvgpzRjbVp2aAD4HljlVtVpsTuR6iRYz9QGKTF8nAoXRE1Ys1G5ufyQL2jCwgrxVl9Sbb0 -atwJaCggLQZcf2XRWVGVFk9s9umnogbuEKDyCb8nshE10eZBQgZLPGeDue3ExsyWKrSTmP9r2vub -ylZWI+6uPA8ABioyUctC1YW3Jj5WBKcJBIPCiMKds1Mkgczwe7E1FIubrrCWERDFlwSt7Qo+TVHN -OeKAiLqyiAGTDTVxDICiTN5ZDy7uNMHKGk9IgNztpqY+ejkpaRY09QiHfqDEGkmBUqSRGYwMfBUN -Bf092X2CzpvU8wHZzkAQhwEzvmcGVPRlcD5IfeYEASGFfFGugkDeOIrKERYZiYRqjsX3avpLQFmx -NpOImoNABoH44WzAABYjK5cvSw4Q6yUyOrJQgnwWK1TnY4s8IbeAoFbwYwEOAFof7Y5XNYlp4XuB -SskBgEmBIiK6YEVtlJABrV7u9ApOqLdC+JpHKyUUTxKBPTpKTEUwUsw8Kxj25I5hZMxw6CtO7MY5 -CNTTkZo0wZmr1QrxOYmLNBMMNnk1KLGEkV/rgPBOSXOdYYrCZ4oz4QeWW+IEnJyq/ECEQlXdquCI -lU0BG1949I1BZyOAOzG+bK5LChCnfYDrENEqosKQLbG+EmjLSiaLbP1Qd0p9vr/VyirCoNlS11hr -npmQnGvBYtaUACRAoh+n6tTiDPtVrNaD5ZAslgyGrri/7w63Wq+/7FnGZmE7SbhnkrE+Bjil0dWV -uzQhiDJbcQxRQNH4i4LV9EKghkm76b3bexFkU1JmL8pGkuVnBBsR8TARX+eJ/GAqCuTjBJqoYxyY -gTBJxOiN3PhEjDnSVFMUzylStYgsBs4ggD/YowImelLOlS3VANLLZKwn3+ikhpXBcDEkDEb+jTV+ -cH8LDBXASquu69XMZEX6drF2k8+DGEVPij11GUSNADI5yvLWvg/wNfkSrokz1Q102/bY3OrI//OF -fe2ufqnp6MvfPX999Dka3x2dvnj28sVPzx8fvfrh0cuzo2cvHp/tTNr9N+yXuffixVNeJ3zz6PXr -s/Pnv37+6M9Pz37705PHZ6/sMm59t/mov798cf76D/94eXbxMd+e/fXJq9fnfO7FkSoidSqaRwTY -I+YKhoTCFGFkO70vvz179PTfH/VR+DtO2rhw++7pk9Oz704fPe1D9NvzJ4//7ewfWwQU12oN+Nvz -s7PnR1+dn7/4mc0AfzICEjUCvHKHP4A3SQ+N2l7VjIK8UGG1xLazQ4BWERCQgJW2XJYABzQBqDZ+ -jyts3GJ5gdU4Y7V9yI7g3p+huz7/4/Pnj56dPT766/mjx0/O+rcr/ld8T5AA2EuP/3vvrxYdboRI -679YRkWd3vWPblRkK0v1oaka9E99HOCbFgO/4797zvTTpEqd/q+ksOe9gbtJRGnpv1e6572r3ZM0 -EUBddEPbaJ/vaaVPR/fuYRIBrbz4+B/SB57sue/9sP9jh5Z/Bb3enRQHiluo9z5ME/q7eqIAFxNg -YvqtO3iYBwA7wePCH1YMxjOSDMYLxkurB/AftR/4DvNo/tPDn6RyvuV/8FrwOi/5x7/p+OXyw4l9 -X/q5C//9M7tKG5to35+e4RDAd4kjYauOLr2/IUVtCPwgSeGF0IFYSteDDowufEGK9x6Ly/LQfcKN -J9h5Wkpf4f9QQ89Kazr66qVpod/bDHjDUF2rE+nyOehkPCMwH2mwSPSnao5QWc7mvYg2FyGgq1qs -zH0f2R6mERikOC1ePIkQlzWDa0FhTb9OMhGMIecWxzhr8zkE4JiqI/RuMs86pcVZSBX50U1REvsU -y9Mgsxpjawk9sPbLiTGoKFEXoMK5cRALxoN4bhn1I8UjWeGadZpUZivLXyH7bTUwdzFq3sqSb+Jh -g3grsvUFDeBcbSpBkvUHwopmRYDIxR9tTErWv53wu4FVxSqciAtETHoyLuIJMFrekDRL6xvyqVpb -P9bOg+97PQ5CTetBiMbUOYZpsRjGUAYSw8aNQ+hgjA+yFEzrc4rqQitDK0PgjdJz/Eaf6VQ2zlG1 -zvoQxN+AkJp/F06XjVNgJAITOYoHqmhmAnNYarFt0ApvH89ZTywnDAEh06w/2VpaJ1xuauwWrZXk -pKIF9n9peXHOusQGAHpCJ9FZBpTYTE7wSfrr1qOFfiGy44QvQ7cRIgLhi9onVAUEFr+T0ZnOoiD+ -4PEbAzRNi0vMtHBDAmtaJMJDgMQrolyzoBiZysZZ4FACANj6qa7MIV3oVf5GIIDF0nFxSCIfA/c6 -BE8W54yZFllF6Tnx2WvMW5UOMZCt5M0lVGwJERdJUGYzAgQSSTrjpk2iWN2+2WrniVbbz7za816r -aAUY80EYHVIYaXTqQrIYw7VwjPTiRPsYs2T9wWbR+KbrY+yjrwXribGUqSkuJhe7OGpyLXfYMf9W -ZOSvdZ6jeC6mB8Yk3jfRCYdncFjcouxhmsgHo9Wyb0X9ZdMP//yrxy/+fHZ08ujp0yfdvnn5w5PT -o3vnP7364egP3bn5FffFlI7+9E3fZPvVC6oCJ+DPfPjNb7769de/vhfuAbPQd7ffTBv/L278wulb -/+9ejH78u+vBfu3ubP7aTzHnk9xNS5601/Vae3h8+od84LPHD7uL88OmL8Nytbaxt281SqdNBV8a -OLCJJT8TDTjE7lEG8W875sHaivpQjNpXaxMSPNjesTN7gz4hYMvTo28TApu0HHderIu2X20hGk+y -tNPyEG2/4FqyvtL2Ay/NyPV5O++1V3QFo/BNY3Atk3D9CGxMzmmASlMvIg+IyN3BvJX9Ttbhy37L -asrKrdkhWNPkVaksiY0LCdKvwDDoNBMGph6WJzIUZXAfiYJB55cnNmYUF+c5o1yeBfwAy1MgqLws -IDWR3ZpQNbyeD54lnQYFJUCFzGM0f9BRo7IQiBUb6xlT5pMgo0J1RSwjkXnuiDsLej3m1HwjVHkZ -FI7PgmdFPNqedfnT9jv+Hi87fo/RGL8XIzZE63GdJWPsZ8HiC80y7AeAJkWWSKXxodlkvKbFVIB5 -xJC1JNXAtPZza7adQENU1p6tD2hWRatnn8+YC21BeMfaaCRK8VXwlci4MupoFstvHmIkLMmrzCVp -fP2NZT6r0SlmtXszgoXY/rrSFDTztYmW3xFVu72GzB1wSiYB5Kqy1mBgJxTYbD7lNJ+Hx1QJJApA -gXmcnxLAcYLy9ozhrEY83n/xu+DeW691orJjoAVNkq0xsH7NGm5R29yIbV0cQKanOvrILATjeP4m -5AQFZyaI5u2M3zC0wjzVJAIigDPNfoMHP64vwd5ACs3OIuvoHoVhQ/0cuIyCNVyDeQ== - - - V5Ri8VYUgEzshJyldU1wnPMbhoqN7aQmskkiYfByRNIIdlNc4/igElwckLyklqEWuKZucarZ5SNu -CFwZDQ0lY+N0vz7GaRUuBE6oqeVJKBEIpnopIIw+uMVp4+tsCNTSHhKAoOwDr7fL9UKYZ7Qdwink -5lmyb+2QQkvUMeMQ/bZdYmsmn96KgXfP3ftNOAm/Ke6rk5N74dfx698E/+tNA++rX4aBN23HGXcM -vIszBkSXF8Tyrkqs7S670YdtNT1/+2H6cvvUHcGklC3zE0eff/3k0bOz12fn3z5/PFIzyFzG8fev -nv/16dnyjwHYGPvjt8jaPD979Wp9wL8cfR4vehS25myX3bkhi3XRnSdsqJfeuV105zctwHlQx7Nf -+YS2vruWye+ev3r96Pnp2cOvH71+9PB3Xz/890cvt4/56nft4a//fnb6Ex5y84ytJGc/4/y0r7oj -pnjesJiumA3zt5oNu1HCql+rf8UHZ6evX5wfffPo9Meje4+ePz87Z/aK/oE7+uvV7H9H+x9QSQBv -2RTFMxlM0EGhiDiQao2twPlXC9tZV/HXqp7jhDSKjNZFo6FBpRDQHEgphGzFhii9Qx1bHqSFDHpE -WRToighKCPYRYrk3a4zVC008ECYaCd/178wC+vVv9Q5enLJiFY/P8zGiLpuWAvVnWZ5E8FlpG8cQ -z7sW1Jk9cLwAZezkbe8HAc3VMQYUROM7yOIcZLIB4Ef7LyscUTkI6A1BOdXeALZbML5T9EYHUAOQ -UzVAzsR71dHiCIBrg4RWa6kN4x4tnAmJndSFrUVAgKrMJfU9yhpzwE3IxZWsAxWx24FMLqI4Yuum -lFSZYAV9xYpawIdqNUnC2wM8Grx6y6utLEdE74SeOrDoib0ljRYsQeQ4tufoye60FdSDrLvgQwJe -vQ/5M4kA0fRGtwqI8uQLKankaMZBP1XnenwxYaFJ7GhAQBrZxrMMpjQWQVO3RiI4x0IBZB0mP1dS -JRZBFMvzYxeBFHgW7F12lQ1kkgzyYTD7tGFitHiABcFWYzwR3ARCdjUGfIzGanwVsJiN8gB+ugiH -jEQGq/FtZ84pPH5Ru0o/IB4rTpOqfpXEJ644k4pCgeLinOdbJAFEHK/lsjzzSdEEzdu4ICGbZ3cw -hh96Tk2F/KjbI6ETK/hQkMBmY279xcDzgKADo6v2WfOxeXn23TNpQkXazKkBrttqnRfWstQyoemz -oKqGeQhG79DlWew+2BZnoUqKFNyzAP1kLCqwmJoM6C8FgXjPrcl7sjuf71tWlYGbhEyOvBCUVFmH -FAdVSPa4JKi9OAEGvyGJPiYRmVQVcs0yULckGzoJIhvnrn/DvVZ0eVwY0FTW2Yxbw+EmX9nW4yl4 -+8/YpUC6gGAHAleRHEE5NM9cdIkOjVZ+1AflRy7Wie/ZQuaMYHm9dic1N4hrKjnCfZdrmZ2ByazV -1C8XHRRYyzOv5aqOQlwtnIXkPRDOuwGo60bDquJV9MmSKJsXxRj8xTMTxISAhGU4Ft+R5js5b8mo -EdbzvarZt9ra2HyvbIvtj3aGop/1mwFCQ7dnEHQBQo0Gbaby2GAdnCBkN7S1kMYdxgXRarGYGlqv -MsfS4Pm5Esn00uLp1TArbC9zUJhH4jWllRI5ZYRLJPo0G2E+z0tWhC8CXk8tYsD/sb1F0Tiwfa2V -VEJrsdgm2FiwZxOgoFLMjvBV4r1IfGrKiJVenhMHWxCVHxHvTnRMVE6V3IeZFQb2aszqOKNlwjOz -2ozkK1n4aPI+YJbkmseL+WpUQVNb7AFN1tNy5xgUq+spWY3UfbEBaZeeZ7YVHp8strZmNBfju0PA -vNaYHMTlqSX4WlbFV7UUcNddC4roqTbOGn1ShgBkIm5xUuE3Sxsn5ePFAVgkZBrZnrkne2azFB5w -c4Rl0bZNWYONzoYk+ntG9k81mgE1GBD24Agjx1nmTgyLjaWa2XjFTmXnUYadLdf5GFAgOxRXDUFY -M//aZZE4ZB53vm8gzp3UUZsPd129N2+JHPzCtxt6ZCUGYcLl1CsEZEhNiOpkS4Vnn5A2uIGa2rFQ -j8WNKNEqNKnC2oj3x3M/zdmI74st59mId9ZqdBiwg4TxxFq/J61Zsq+tjVx0V/dlIQCPS9wweqsy -6WujFzRQvh7tjMFC4VGX5LRWJs/YpIDGMjKzCeM4DGIyiqeyvmAzejq9rd21qkHHeCxvpEVLe73N -ROuzkc9JjJ2R5P0QTGLNUp8KvByICuVQzDJRP8wCo+xYCkjBu3HW6PY+BMFMnCEAgs2px9UQRfbG -CEfr34kG6PidjhXT1Cl8hUgMydITa55LZ3bdKg0pfUBODHSsR9h1TJxkfVjnuRXFjn6y8CmT1oe0 -JGEOLJmGJg3iGSJn+gm/qrRtkhtGdRyJnWChrDQ2vQjC7eWuUKujPA8w96H2ySCFUmvbGkDqkswx -GvvHSsXNqjyVygVZcGIBn/YhcD1q8sx7VUbDTM8SRG1n2czrnXl6smfurtXbT0sNJ88cZWta86zW -f0YJl/Iq2+fElCUd61AMNLoq75Do5Z2Q91NQdGYyvNxWsvQaBRU2G8SknbVAGEYTiUWrmBDZhtEJ -McOVREXXCBRgaeuJCu0kK8ekZlwKWP6w+B2T85snTVY1MQQsDQiLs0AJmzbOgdqZUs0bxxSN8SyJ -rHp148Q17TwRI+NF58b1YzRWbLZn3VxsxNC7vEKhzGMKZhNUSM0Djx3cqjvnrwMZqt/m74e9F6Nq -n5hbscqy1hJWn65/sthj/CziQ1oc70AUMB+PTgyo2Lefg5JyfTx2aWl4TbFCgvOtGXeyMwfvX3Mz -k6eyHJsJiLxnS5lT5+hZABONbEBDUBgsiNtTubaY1lMZFVZsc2JTuUi521SmaJIzYz/R0Fj95ObP -7cpwJu2qa4jK/LlRgAfmmO1XWuxQaIeillZN4QCtXDmYbNTr/GIqNGm39RWbbrF8XRSRsDvrmIfO -SNfnp49o+1nSepJ7sllQ+0GgOrKIVJW1bGENNCQkZeZ5a2HIpPSaJeyxlsOGJARTMLMwiMZ1fRSB -TWUpkGbeOAuxkLpxVjWWtoWAfrW9HN+FLm4rR/Pbwr72iyEhCbiiWPMs8aozn8e1WVHKPPjJGkuc -LJSturDxk+kbotQMka75Qye2c9KCGbKxMSwEjC7Nv1EkHfWdZxkjrGlxEPxaALrWgjLvQWtZFcvS -UsAipJ2ZeLJndq73oD/uBRjN1RBXc9uTld7y+zghjFNW9w9nTAarwaIE04usD1DWzPRyEz1RKMNn -5UcT20aAthW0meCaF4G3E3EFWkqO2cFIRSLlzejZ09Axjg2zFfzzQVywxWj/wHNQRPaKDDCKNp2f -RAbrJ5vyyzc62fOWGsQ06A2Ho/2MMmVNs/m56L9N/pdsMMJkZJkIxI5ibfgVTQza6nCO0hnwfZBc -nbR7TiX5APNFbdrRmkmA4ggbVxz1qMecaCApRBMcFry60TqD3K5kRUckGVzBSSFAhjB23uhkz1ve -H2nbX1KpEZwU6xva2CcIZOIiFW+Is77rSqNvX5z+ePZ6FBktEP5wOIFR6M9zPeAWQSvomW5hWPag -LeIohxWard2AkEJBfC1k9fPq1AFYBFmG0E8D1dDo5Y5d9B8qpiQSyQ8VjihILSyZYzHz3/QIYD9A -AbRSC2TlJyzJac5Xcoe4BRUo+02AYmU84vZ7/IPTiTYGAjRjZLA+1bgevq5aQrMQX1qRvgksXLpj -CFMg1vf9nnG6T2CC8lDVALT3iXpzbCCmWImO236B+yw8bE4mNjEzXURKdcKGrb6YjR1zM7tMfDQo -qicxPFij4b7RdLROoV35oRMtTVnSjIn5EmqKxqk3+ilQ6LAVSj+aRPE7o3JyWcEitEfsLoC7MmgA -HjoiyWCKCSicxxd34GYgCif0jfdHkqMruYKdR3ovkI0kq+UW6AHZPtbLZBZ9fQPuzJHAhL7giapF -k3W85yaDF07W3oucC/teeHdUtsdt3+Buj//O99n+iCfizEvRcGWZvYaY0WKPW5gUIC0Bty4bnFqu -KhijChiHND2SdbAmOT9YnLfG7/RWPyK26ko8tS2lnYd8Jv5A9asxHihsF/DIMdB0kBEIYOwULAZB -GRRcCchGyDjy4IYmyQ/4ncGIse8r70yF3cmyOyC7g7YzrHvG/haHcYlLwrkAWXtirftr/khlMbGV -HjhpkmUs3KS+wHQv+vgA34y0XSX3rYWsn6qiPQd2mImk7IUsWbcBtm9CCRIB1kUcc8g8gBbh6Z47 -P73VFwfjbfIsJZiYusLyJgkHmwyw089TVq4E8I/QikvZ8OOOXFbeKjufkjeQ6S4xM3kTKYfgrBHJ -0z03vd13csRU76wMRRCRDMfgRsGh1V8MJJSTGviyiqGqpj+zfsQaDhIxkcyH3JLdlyyjGZ2z+CRK -5RC5L8wXe6JsxSTYTdost4zBfeHt9OXvk0SdiSqCZOHZu9FVqIL/DI13wVM+ETeQyaF7QrL2Tdl9 -ytQqkshRucm0nIsl/HGSV0lK5Ao/2TNKlxItXH/T4bcZZaw/CiaHvs2zXRQdm4iSskrzkbRxLCB0 -UjOAhJYRLEGa5W+cZ4AwilPCC0eZg7VbYvj2H5x4LNrqq1M56afc8130uhj7xGw9wN9u+f37mC/e -FvSo1KmI1VeFAtnpOlrJU8Ujcc1grpHTW+EgKZEAWuQVGCTx0Z9+pmack9IhkSHOp3vucssLLoiC -xlnzmmfs5UNnjPWG2Uu7iX4CMV/4V085Q8mIZj1unqJCjD2igAcg98fT3avf7rMvNf9Pc9FNdywx -hr/dNto/ZsP8FQfgYIpf1RR/dXuT8GBj37qNfZtf59MxqW9x1JaK9ZdlPt/iS/5izOdbfCeZzwdr -+abW8i1+ClnLv0CL+Bbf8f1ZwLe5Zt61BXy7inpSo8eb1Cq9l/KK4T/eZqB/EBn93upqNmP3u5RF -+1wBSK/gDPTDruIO4LArOAR6lOu6BP2sqzgF//TwL+ux2YjZ92+6x1XoX/EKzsKe0btP6R6HoUv3 -uAx8/B2noT/TrtvwTw+v5Dj0w27gOvQ73sh5sHG9nRUs8oQrxPL7O+56Gl14I1+Dr34Db6OfdyN/ -g895bY+jn3UTn6OfdhOv45Y/604Msz/WHmfknx7ezB3R1a7vkHBFXd8l6afdyCm55UHdJODA2tmN -91O97LgsUlvbTguke9wWaO9dx6VL97kuqKHddV72PMXTWx+OfS4MqO52nJg+HXfdGBYN7zgy/dBd -V4bCHWdmzwPc/jvKpdm7nvb5OZTewNPBu+z6OpJe29tBEfWuvwPpTTye/u57fB5Kr+/17Bm1+7e/ -pdk3W+QK+GMzW9AXzo53xA3mzf4R5+ObPSRO0B0fiZbGm7ykWx+RzdxBf4Y9vhNX5K73hNfY9Z+o -jnY8KH7fXR9qz/3uYKnuelJduOtLQWPueFOcz1v+FAg+dzyq3fvc/ptc6DJ9+ad/vw== - - - /8fffX30fxwZcuhhePiro38R7/PDfkL/45oR+kP2rlCp//zF86Oc3KfiRl4FLwZq70evXq3r+gfV -W2Tj0kktXYnCBA9Y467FDpAz5Zu/AorMsVllIf3exGJBhSUi2s0UK/wp1vaVB0eCECd1yaWkWEUf -zPiJ/D3EY1KXFO5gLctsiWrpTEYKqyDaEKpacZas/7l+vHFK5f4zc4pMguaOJ8fxzUlNQ0RTFmo9 -2g1E4IOnZ6sMGlnhaDkarljF3IaQFaQbg1ZLbUe7w3hyNTJmML7rCPSIczQ8Sijavlb4N6DNubHh -JjrrlCBaYjFzOzYs1PkRHXkC2a1BhJqOuuvrxAMLOuY/g09QdMxvUDgvH73+wRU/PXQXqZxiy+e7 -B799+B2o5xcLZoNC5OjL/3jx+tuz0xfnj/tbf2Fu6FXeb2etnXz1u9/aqP3hLy/On+lv+whC+qN+ -9/ofT88erp9kW+U4Rq62P5C/0gfa5UcXzXVepIhRIuEEnd7Ec/71M/HDkS+TlWW+zqkO1ijNwsU/ -rHnpLJmJcgzcTuH6AvaP+fz5hkNyyqCiWiyNs7eusnOrU9YjbD7QzoPtebdTq1n/evPNo7rePeOy -lEc+ZPxvYoxKfxmCjWcxmein49HmsX750iY5VXKCPXHmo7Yvs9p3r9XOE80Xmh96z7ud2gxDq9PJ -mVWGBr6oZrmQnd2BnB0lmjAUcdEMawbTz02BTLalrpcPPkLyWXwk3ZeuVZwERtzP2ImOHv8GX3tD -VzAQuaDeFo06NvjarR5tMYevsfMg5Ni6cv75s09vnr/6ZOf5q2UFyXHst+xb7lrvdcvjs6unCy7b -XXZD8v/8kwy6r+mT7J1zFkq+yazDqTead3Qzrj3z+lk3nHuXcKBdYUe+gka5yw0ZZra8gBjjHHPb -/aTrxQSP7SbLiX7i9ReUoj03WFJyqW+2qOyT7hmaixsJbZtx3Qq+MzPuPU8atz0uiw3r97s+0F+X -5NPoNInI8zMC0EZ/BxOyLD+pBQT6Uca1pF8hhzg2JBOiX6MXy6WuhD9EJgfX5MAUnBKMwA7FQ8SL -uPVFxu/5TqfE1lE2P8+4yPzIu292WQnBVb5tyOuPi1hlQm4SaZp+8YImq/1Z7/LrTgsbfZ9d7gvt -JN8HBASa6N2LJhawkmILbzbSVdjY/VhVAZNvTYxhKA0cdG+UkfiVvKfJOj7gJ4y0ydpJmAjttpkr -1QVwvvJtdpchOKW3nEmuN2SI/7K9nV1k/r28zywczzJfZn7Y3Vc6ubjv0xsG8arzQAMc2DshsXFv -RUAVHWSRVEOAMU30TNlKHl2cfUrHGRmOPzHeUEBfwgg6Ojm1PacGZFXQZRQdqFRKi5ZNN7vpvSve -1KWqRuzVo+1H37Q32kQdVtdFq+vqG1Tx5e42qI99mNcb3qJW4tv1bzpkrbtt3er4+bNqTUUGP9kz -ekdMVeK/BoW4mujKcaQp1Zt9XxvC/opf9hPdH87+/hp3mI6+/M352dkfnz9+geP4sw/q754/Pvs7 -BAWx9xfn/5gF/Tr6EO6G7sjijV73h3BTyRe/0ZtZhD9/xvn0n0gXoN9aql90TzpOU8hfgF+km4Y1 -8l8Z3ZO+mL6Y/vNXi4zC6/NHz19hXq5nJIbvq9f973/+6fXZK9xw828LiRsxdMhPzs8evT57fO8f -v3uG+PjZ+U4dyvWH6K/Bu0tMzmuMzwglYAS+mH8URgpL/WLF1vb+FsdmvqN1V5um5T/sT3b/wg4T -4Vc8rz/GtOzcSQ3x+z//19np603lsdYKl8DodtpQkhSBPd9ijaB4t6UOrgPQYIMAqVVF7hGTAb09 -qDwjgkUt1djotaA1BClNwizIommfm7EO4Qq0ZuDcn1vRUwDqDK+G3rR/lzKCFZaCaVPAJxxn0bty -5Aamcm7k4EP/LtgyMGEAB+FvV9QsqCVykg0Z350d7o/JzbYxFsaeshSVrUNqtvbGO/oSn9q7lJd9 -dxw5in/+7DDibzvir24t7rPnW0h47a/BGMNNvgfT/jf4Inbetb8Jid6v/VW2hmr/d7ksfLS9o8f4 -Vjv62m/Ps8K71haf736Lr/6ttrBXp4+env3n5+4L9NYMMbsPagd3/RPf4Q6+chMgcLV9Aact9rUR -3vUmPh6BzK+2ietRfLvNfdwCURcb55sxqrWpTgwhSKfI2VebteVSX9BKKiBvlZJXkl3DXG/v1FxP -72AtX+KAXNNcn8CCRts8uf4Dc3pKxctcT9GnPqd9d+p44vGUi+9mKljRYv2gNEDw0+34OJ+2Db8V -kKYhMOU10oWdxZhTpXI4ngQB5uIHMp7p0mM2dUIPAGMMBTRvUgO7xiajkIGjeMrszwrzRiXTuE6m -zaO2cONAdBl2htlbXBBM3C1EnXocSMXbrR8mN+4reu5IrI3Ow8Kt9quQrxaHISlyH/2F0V3UL6+G -jhzoe9ePJg21QgrdT2QUNRN5r8M8Kdj6zUm7uLja8mVx00ktp8UMeX/f4N3fwh0QB4tO1oSs0nIX -qeUs86P5q0i9x89J/Quc2odRhs7JqJ2xK3QpG7Ot7zMkw/wG8fd8FApMwABnV5l/b9xpLbXHma8z -P++e1zrdIvMj1DzlN0zVrUz/9v609oJagunctfFhqt7yVH31KU7VbdQAeP3fA2hg72ymj7Y9nwmF -3pnRXbpvTlslyNastoO35vX6wou5qEfYnttq6LU9u+Hk7czvf3q4Z4ajbmNnjhOtsDPLeejOPF9f -dXMQ9s31fYN7f/Y215nttC/pv7MMcI/rLwRC0q+7FMxFv/5iQEnPDZfDxaNy9XSKc28XbnfbN98g -q7wgELm1TaALp/p3I3LiDVHM6pRJpPIKq7Cp5nFmC1WEInLQb8uvo9ACEZIuQccGVKEU3JNg5FQl -yDSn1OxdRfuzrFa/eRAf5oEdlBhzqVYe4KyArX8pcsrycfSb1LqnLLDGwlrL9J68SgCe+Wj54oM5 -fClj+6Sd0XlwgzDkYYSvOcK3GHbcM/Ymvebo97NuMP4qx3rjF7DDrv0NWPRyg6+wOTAXfodrhRnD -+w0zxneQSbwEY/8phBkviTUdwozXTBdetkGvkC5g/+6JaQPjZac0QWtVWJnQBK7bLhGlxDB5PYv4 -WP4IQbJeGGimycZCid0n2W2i5crLFGcgRodut+sCGSvbWUupsTZEji1RNkV81PlcgV9rVacVPgdq -bpy1ndHDolDVMa9hkCm8UjFhy3pJAqpwrTaBpH9zfNDDUDddStU7bkOk/iK7Y3ty/S398IXe9Re6 -PZNg/7cb8ut+PZx3w+8nsPFNv+A4+ybfUC97w6+4PYLX+47XMikuSeu9C5Mi3L1JcRne++M3KaZ2 -MCluxaRY4uhvlr5UzARhpalY+rLrskwaCXQLHkyvVxReI4N5Q0DpDTOY/h1kMNMtTeocux4tXzCV -GV0OmNpdL/v8BYg/Sp9GX6wy2kBrYnVX9ot0HGPKH5YWqPUus5cRxFUpIrXrjmtp8Z0rgfEE7NXl -LNuMJ/mFoBdA+BLUoF6hU0MaT9W6EEZFva8qu/razzcsWr/h2nfvIERwSRTkelN5aiFEYI3T1Lw3 -JVBLoChNmNAfw9p/SwPoTWvfHfdZzqXfyhTew9LnA0xTWyx9PMkdRBSuDECGS0D3ZYGHpT8wsQjO -IJhY0a3q9YTBnCUnS0ispCWsMZi4VmYnzQGm1B2tc/mmMPjtw+KOZPjJBsKkk8NuoDMKk65Qdm6G -YUogsrkZhSkhiDsNhqkrDcE8NNUt4bGSle2DUMK6PaCXRhJKuAyjfPgod/hRbh/GvPxcaxzzdT/Y -Esp83U+2QDNf96MtAM3X/WwLTPP1Ptz20F31010jXlCn24oXlJvFC6Z3YF+8ncP8wccLDkjn2zIY -tsCOfWxhKmDVN6Qpufwd7YgfAZZCv2ZHJVXBLfhM2CdlNFdzxvO+zA+PIAIIbMgOfX/P+ffZgPl6 -JGkTqYn9kisS7Ik/f3YXT/fdrW0Z+55OkJk9z8dC2N0n3HMVSv/jirrRh3BJUOJaurEtHM719Jkh -ssmY5vZCTa73rRCIVsh6BVOWk/KXNJeu8XzvbTZd8Iy3MJ8uidlcZz6BsO3KG0C/7SXRwitsAFTh -T/vO9J+fh+OUfHHxrNsxQLZzbPzZ6jYd6M/dHlVv/9j9E5NA0vn9Z7qpvt9rYaxzzkHokukYHaRd -4z/Y+lyp59QHIgqlUkA4e01VunP+TRdnbNPm4owtgi3758/u4hFvb33ue7rra/t9z3id1RlvSCO0 -szrdvhTDcTf/I7V9bB75TXDm9UkE08Ylkvvv1f3X+HIX6K27m15IsLq7e8j3NsEu3ADeeordkrOV -/JLhZ5cKiupMgWloLWCwIzNUJGp03i3y9UhjuYm4vYnTkO9MDmy4t8Q7K07SnE2MJGIedJcomXhq -r/YJ2BazE5ltnKJvxU7NjlzrBNiFadKIF1KQ48JjRcDZR9gPK5xpfAY9ivpUgIEd/+jHM0BHmvxA -tsitF72MDqhvEQIzJyNQB115mgg8CK1povvxn5VJV77f7Dg4VBb31RoBKpwJao+7NooEWddSQo1H -/li7Q+xDBjpV8NWGYz81ENZ2N6mhh82f2N2wxOPcx6wPZik4v+Xds52LrhyTX96BAwuDXEjTc8Nb -37vyrUm0m0D8xLMn+Fi48fWYdvu0uqEl/WYGnGt/tHfFuruXDOfC2XcFMq91kurYqXUG/sFFzJU9 -CUmDIodQs0gUM7uJoKuVqNNQrGGL2DV2XhJVg89k9Ec+ivUSXRQm7Fjrwg4clVzMqiaofgpunLwt -fkpx3x1I0gVSq5CaMC1G3IWqjqlM9Ou9rW6Xs+kaFQRPOtd5UYShZYYnZ4DQM7ujcLpvaO5fRhK3 -M03frrLgavZ4vIwu6Hq57lpqbF/0b9WN0tyQ77J/zX/L6JTlZSCn9IXzuWvL0m43RqN7HY27H83P -cTT/Tc+REox4exw9yeRuLUZz7WSum3Kflt18accxh8DuD5nTzVh8Q0FJS4NyrNVa+ebWvBhSwWEn -2dbZ96kgrzTngn/bACy4Uyc+pYAkz0DAmLxrZGtM5GG9T1LGwt0dJ2Qr3ds+93oP/pbgdTyHiB7Z -HeiZiCNZLTCpHRMfO6G26givhGKi+7snXu+h347YgyMVxFiLHjOD7TnzaWDNa0LMD43mMPd3z7ve -M79dGOptm03saSTxFs0mwP3Y92a0wyp9iuq/ZIRsqox8lx0onj15/tNu/wnXPxU30r5g0FiNYd1E -vsu9jSfcRY0n+vdH5xiBQ/AD/8Zs2P2xsl8bPy4yYkORGdENPhTWN5oR3YjzbONCY/YInSVgbANU -WkAE2UAE6X23DI5p3MvKWFkkhb0sjmI3l+oUjoaUVOoZfEGNVOr91P6PPz0b5wWHFhVuIllrvfx0 -l0Iqx1Sk905vduN7N7pxt1yDTr++4eqzfxjvwnDlh3Lr7xQv+Erv01q9ZJq9yVodlA== - - - jcdxkcabjv7rM/B5J7Resj0Wv5JN/e1/r9JYIctfF7Z83dGbuVzcUeiD05tuOgoT25AdBWt/9S41 -5aufn7w+/eHnJ88fv/j51cMnpy+eU23+tAdKg68++Sn7jU9/cX8eNFFzqAX06KAXnZqHJ3KZDdH9 -tSgeR/oV9xdn7pMtTr1Ijzb1PWmTVHyebEEyoFGOSkTvmSl15xdeN1tujdm+8mi7JZYyX1AAT2e5 -HuduM8pZrlPNS13p0RVtShyduv88B7/nGIQpVFbUDS6iZv4Nt4FmvMLR5RgthO5d65n6aX07Qk3C -VYiB12vwvBvx0ZXwsFzS1estHP8rfa73yXy7nF1XU5jbs/7Z3lkfjeMWotLfNs8ECo2xt/XvENCs -qn+1IUKdPzoPJYY75/ts3/eKjZ0qt4fYn8F6W6WqRk1E6w2ihX0fyRW3s6bAYF2MxwXswOzCVV1A -L8huMWv2Dmbrq09DbAUJDL3pbuJPV3rDdzUNl19s35R84xe7Gqf8Po29VxfXralKn7r7yvNcXQjm -yTrLxmxFi8/ldN25/bXna4y7bx8UoNr+nDV6NM/sLv/2hF1hxtaprGcs6raoOEfE9C1mrLujGXvV -d/zlTdkLPtobp+yVonJp8v7iAb9WVK7P2dwnbjKg1OR8ir75LxCHL9HX8kXoY4zAF0+stwyY0u33 -Aqb4KABY60H6FtEGN1x/nOqvE4mbMMnDZkLwgoAcneqsiG4/LSiVnhQrRqC5Ijq841oz2e+C4nMT -WB77fxVTfkYqquDRBH3IiCIBlHIhSwSKMhCW2Y12IfAknTwh9oQyf9zYlu/+WgQaIySax4XDceFZ -4+bj9wkjPHzGIbLAIK84ZOyesrzuLBj3PrFmLRvPeH9TqDeZLz6/7M4oXZIGC9OvrOq0vwVslGOH -th+o5Z1QlOujj8M5dfSsu0GP9hBse127oci+wOsYQgRJJOGtE1piexRbeUaCpxRQKVu7/w/rEnox -4aLBjOPEhDPSiS1HCwrtObv7xnmqYBBBnwo2sJ3DCP0YonZrqhecvXvvYQQHtMQFeBYveOG51cEQ -jtCNyevcKz53Pzu43LQbuL7IrhmGgBntai13Y0Zf+Uu/1zjE5ZP1Cpmz46UvKr2SNvVK/26lbOkV -yagOPKO2syyhBasC5xFkOEvBQq9ItqFXJArEhrujceFh/az1in5v6BWJpAz6V3NtluExNq47Czb1 -ytYz3t8U6k3mi88vuzNKJ1cLwmDm9sPbzWbuvNHsBTd0y7IbLYUdx0gwik8Xt2X3xVjo1chdsj7k -SkFm6/y7EAgawU8nWbdAsxt41yFqxXUnelw4HAvaMG4+fp/Q/N2UacA3z8N4b1x4IdDN9e22HvL+ -plCvMl98ftvdcboMG5F3PNYVOQ6getH1uO/h/nhqDIlbGATFz+iu6SoK6dYRWOk+f8yGX11zVtze -LcIhE0un+2m69KWnBygk7JcjKHK9m9670U2hrys4q64f9ujjdFf6+tKv8l77/OxOnsu7+gz82UBU -mhkIi9DwAv+Gafpfn3kCpVH6MnW3j8bfEBFwRMiQ4iLA0e0XjpPvIxiSUihun2hhvI0T94gSyEE8 -l7MXT+VS5I5bwwpdnNjnV0Obsj2ixUNsv+clgUsf1UEX+x+HvHtDU1fkmai9MJy7bjaUo5JSn8do -YZZCRI0Q90xbvv1PMTTysk0gbVHkz9NtV3PtvLVsA7RLyvDfywWntVbZvNxW6xXvce9a9/Ch2+il -hJsmde4KjXSFwX+vAKQLJ86VzKh8tJnN8cB5gGXPuFu5NCWC006OPC4cXwaycFvm1rSv3awvMEH2 -iLqlM2GBLk7sVjlLAheivkcHMcCOp9iVLOwohBUIQtonWzzE9lteIwnVd5K3g3dcLXjhy9tBihYQ -/0gCpil/sfKp++p+crdZ73YlcP94hG5y9mcw7BKf5LahQkuzcrYeqznWZlGSILlbEsiFRAQ9Ktvb -1govfJ7ZEExqfRNQxzq5tayrfSWscRVYFGEENnEr9UzdEMGW2xDgH//YOKjkjAs3ahTYfYTu4nFc -rGvBCd4hcWNdHDS/aMnKLSzeHA96ujUakO0Mz9+uFnT14Vd2RPc1G3lCj2tRCA8+Zx9Oz9y3Rze4 -dOR93z7l35saOu5bAfCrvEq3A30k70ZXWv1HlVuOR7pBmBVBqYsNtbfM71/tJX8pcdY93+lNO0JX -m2oKvFgxCxlXTBAGdb1iQAbtCEpZrxh/rFU2RL5bgIhBzwsGAvafXi+YDREWzIbAFsxCxgXjjTh8 -XgszW/ViweCR8WVm2eKdtGA2XtwWzI5sZ3RusGCCh+O9OZf4b8ylbHMp5NYYXl0uGG8h/vkHFkzt -rn1NY8U4f6MV09y7WDGXvOUvccXYh3rTikEwDfTCyxUDGcz9sWLASQwQ5Lxi+noU1/pixQC8CiDq -Woi6neHya9FA4lwIy1WzKXNEuS0ltm6WQi4c3A+cCOtFgadCYHC5cpzBTRcHze+rlbMxALZydmQ7 -o3STlRPIz7wxp5rjKPYXsTkVpxSOCW5fr5yIv9jKwfTTygG6s42FE2621bRLoBC3t3Aueclf5MLR -d7qdHF7y+WK03tUMw6vc6Omjf5ydu4fuQnDZRYQNP21SGe8DSq2C5bbrOrVeDJ5R14imIQKeuBjE -eJy5T1bfBxgqzgAifwEYKna9kNo2XimuwVBdo+QaLwdD7dzmUjDU+mi3Hwx16TP101CGZnGHG4Ch -LpyeBzDUFhhqe9Y/2zvrB8KEosI/ETvSDGCy/j3jS4aomjdl6JJxn+37vj8wVGlHM7QkEdIcwgyG -cm8FhroTTPMnCobao7H36uK4NVVXA5U35upCsAZDDdmYrau0OV13bv8LA0Mh/KD091vMWHdHM/YA -hroYDHXhgB/AUO8XDJUsHR/WYKg2QAthDYZqAww1ZDOEKBiEaCGYQQtDVteghSFqBloaF26WzRo3 -bwswlD1jW4ChkjlzQ7ZKW9edBXUBWkjbz3h/U2hgqHHx+WV3RukXBobqjqQBkmLqF41rMFSp7KfW -ctf4BT3c9p0dwGXtCYYClDa064Chdu99dTAUzjUwVNgEQ13pudsMhupDiT3vhmCoOzGjP3Ew1HrF -zGCohV6ZwVBtgKGGbIYQBYMQLQQLvSLZhl6RqBloaVx4WD9rvbIGQ816ZQ2GSoZXGrJV2rruLNjU -K1vPeH9TaGCocfH5ZXdG6bpgqBvN3DeAoebcjFuDoeq2jCNu8KAhmxFEkxBEfikh0Mjp40lY13Co -tUiopXHpZrCmcfu2gEPFLZmGfPO8Vdq68EKwhkOlnae8vym1t5kvP7/x7li9S0BUrDM2ye8HRHl/ -CTZpPj3keHVA1O5NtwFRV7spdPbbAKLuRmdf+lU+HEDUvFz9OjNQR/bZKzNQR/bZWWagjuyzW2cG -ysg+D1kZ2WdveYEyPEk/pwU2RMgKbAgsKbCQMSdQRvY5WLS/juxzWKcE6sg+rw+aX1QpgY03t5TA -jmxneN5/9tmP7HN4q+zzXVWXf/TZ5zLyq4sVs5BxxZSRfR4rJo/s82LFZMs+D1Ee2eexYPLIIq8X -zIYIC2ZDYAtmIeOCySP7PNZCHtnnxYIpI/s8ZIt30oLZeHFbMDuyndF5l9nn2NpYL/w3lkucc8/h -rXLP72C9fJy55zSyqov1kkbu2dZLGrnnsV7SyD0v1ktU7nkti0w9u/WCiUofLxfMhggLZkNgC2Yh -44KJzDovNo80ks6LBZNG0nl90PyiWjAbb24LZke2MzzvP+mcRtL5LXaYdknK6ZB0vo1YKZLOb84E -31rS2V836fy2NCb+VmlMuvsFikZkhTJh0eohno5JIYiHv0NWk4TfD//jxfNvzp88f90vsVqZnGQn -y7989j/+4yX/VvW3b57+1P+vYsCf/Q9N0qN75z+9+uHo3x89f/TXs/Oj3/fVcf6rN/3xSH89efT0 -6ZM+OV/+8OTUDv1D/xhfdsf+5evjo9//7VH/9+6hvzpa4RrLE9KlJ+w5VNf4zdNHr994QuAJ3774 -6fnjzWN1jT1nlIvO2D3W3sWl3VP6bP398/7Nf9i49skPj85PX6zfsx+la+w59g9dnZ339f/d6/MX -P55del17jt88fXH+6OnRdy8Xx9u023P9b/u1vzo/f/GzpHaNN5/32xev+zD0ex7b7OozcnNu3cE8 -veALYDouR5+/8T0ciWb1//nLlOvlT33DJ1hPeN3f43/du4zzvd2d3Ttsv3zo/xuvvvjfndxcI491 -qHt3LTgCBu1d3Hk95Liz411XXQkHjbm7o5uX7THvbtr1x/y2l8g+zYDHGzpHM/XLo2FX6Kh+wlH8 -8mj8D8P25RHHrruxs3HxFuN40WMtldXFj+b8/mdbmz23/2Sbinf72fz0hid6x5/9IkWN55aqvnh0 -U9orLdtS7Q38W9abI+Nbut8VC8nUc1UXAAhsSKarD8lNX29rBzu6ZBqlulecp02xXvSCPw6x3y92 -GpVJ13AtwxdD/r6QJvEYIczSt4Xrjs5NJkzT34b78eqz//Hlvz1/8fNz/oLtTBb+X3WvqL8GrM8v -v+qW9d/O5r9/efLi2UsouN88edrHn6d0RfLk+ZEOkVj+yJd2zBdstfrgyasn3QDnRfdc5LvXj05/ -vNZF7j169eR0+Rgvnj/+6cnrq53dbeqjL795dP76oue5/kttP8/l2wW/8YUX+/yC044fPXnZv47m -Qj/5bHynPSf04/7w5LWu53mrp78/l+7i817qBn/52z7Tvj37C/yzxW5+9Ka3+nI5TeHN2aP0SzZz -gNDp4a9P5TVtXPvLPz5/cvri8dnApnz95NXL7hvqJw//Uo9vs/HIICesq1Wnsr6kikC+kv3broMq -tkYsuwIi45/7n7e4bc3N/PLr/vr/ctQnyueL2/I55jfhXv/87JU8yjTEXz/pn2V0udt87QePzp/Q -cxx/k3eJP3171oehL7Y/vNj929dnL8+eP371+83Txn12/rr1dPtvOv/5gtPH1TfP/pcjzpyjzRW0 -PfnvPe1XvNbyuXw68nrr7w5Y0Z6vuo+Dc/EZ1xe5+E0ufy1bPtd4r+uvvDfN8RhzvuIcb1MD2u9G -c3z/d75DTfn7v/zl1dlrbJo/vEk7/u7p058YgXlxfnz297P9GnHjemtVePnoj5DQfz1//ZLDgN4s -yIvZmnjxl1fC4MUhefb0ybNrLIzDrvCud4UL/3HJwknZ5eRudXPwh83hnWwO7JXT3sXmcCe6EAvy -9oZmDoT/8dXZr/929vz3jx9ryeA26wXz+4tWwr4xexM6hL1pcaFyGTxkMfLzs/ySplA5zKD3N4OA -BP3gZ1C66nDcqoX6MXx9PTJ6wt3Sx3+vvsrdTYN+zq//fnb6E55Ff+Ql9gd1jkKdDoGdQ2DnAzLh -QYw0oRqstYgSZsfOshP830Ng52O03T/BwI7LFaX4ThGdmtpUDxGdQ0TnsB0cIjqHXQ== - - - 4RDR+UV4ZDXqkVcftD9+iOi8xxmUPoYZdIjo3Ozr34H6OER0GNFxh4jOIaLzIZrwudVSD1Cdj952 -/wQjOss5nls6QHUOgZ3DrnAI7Bw2h0Ng55fmmDlfPgKgxSGw8z5nUP0IZtAhsHOzr39A6txRXMcf -4jqHuM4HZMGHiG6H2Itb8MIyxBhCOAB1Pk7L/RMM67haouMUL4HNOzGDS3X+0jl+COscwjqf6qZw -COt8mpvDIazz3p3yjwJucYjrvM8plD+GKXQI7Nzs8/sDYueOIjvhENk5RHY+ICO+xlCnBg4vX100 -NIP3pZVDaOejtN4/wdBODU2cbM7VEJvmeP+nOyB2DqGdw65wCO0cNodDaOeX4Zg5dyDXOcygt4vs -uI9gBh0COzf8+gfEzt3EdeIhrnOI63xAFnwp6IoFjvaptkxYQ8lF/6jxchKSQ3TngzXgP8XoTg2Z -LFKhT2urOfQ192l+iO4cojuHveEQ3TlsDofozi/COwt3kHc/RHc+pRlU2scwgw7RnZt9/TuA/R3C -OwzvpEN45xDe+YBM+Oqrj3B6c/aTC9cz4Q/xnQ/WhP8U4zveJUzw3OdsvOZMP0R5DlGeT3WLOER5 -Ps0t4hDled85+PQRADAOQZ73CQI7kO58ukGefIDw3E2MJx9iPIcYzwdjwMNObz55Guw+t1xZwVJj -aIfYzkdpuH+CsZ3mXahJoLTuch6CO4fgzmFvOAR3DnvEIbjzS/XOpo8BgHGI7rzHGeQ+hhl0iO7c -EMB1gPDcSXgnxg+kQutOtOJ7c+BKzFMjDqWkUh0BKaVlEMrUBm6Zy+zQfkKrYc9kubED98799ZiT -d+9kN73FsOCHrVV1BliKgk/x6N4PF2Ctsc0ed08oTPFoBbco++yhsY7dFEr+WJSv/0Uo3w8EP/lR -KV9bOxcqWHfcUmz5A9evU/3Q1OvH5fccpym0KTOwZP9w3nHTP/rxJjr8l+zZcF9BV7/8DubcYevg -1vGBpGU/sa3D+fRBbxzFu5TfSaD0YzTMj0vXgcwmxO7ElcTbvgNtf1CJVInloBIPKvEuVGIJB5V4 -UIkfokqsS5X43ZNnL5+uVaIFk6a3+CTfdLX1+irP0Q6q+QOLMn/YSjumnLw/KO0bKm03Nehqgilr -9VXU31TkB939jnR3mg4686AzDzrzQ9GZc5wX88ZTeR6U5TtTlu6gLD8wZRlbTL584BoztumgMW+q -MYOnokSdjiuu8R8pQ3JQnO9McfqD4vzAFKdr/ZR9k+WgOD8RxZlyjjQ1Y/OOBY6xdM0Jlh+XfIjx -oD/fkf7MB8PzvRRApmly/ui315nlH4529Ol9aMb3os6urqJ2Pt4VVNQtav9PXtudn/7QH+6352dn -zz8MjfdLhyYein7fVU+XNHma2N3CrqRELJNHoPO4TS7Hy0xtQhcOlBAfWrnv9OlRQvS5zV69vnuW -E6s0kMRz7U6m94EGQjQQ7tgfOCA+tO3grTggbnlDOPA/vJsN4cD/8O4rDS8uMWzg6jt2MTmHIFYI -qVW4N/64+KlulhgCN1hD9/U/jBr/9t4sjw9rjuyt8fcHCsdb9tpPXjx9cX70r4+e/uX1i+dnH6bf -/j5M6rcIS90spvhLC058+NrEgTLkOGQimlYpHbuSkGtOwX+Q7DHO3aFCOUyn6xgw4JlesaDB8b/N -+BFK/kCn1l3uVYep9SZN5SdOp+RYHL4K7bi10vqEKqndFt/GO9dV07uYUB/hXDCWs3dFc/XNd189 -fvSy/3r4kpGYhydPz//1VkJsm6bn8fHx1QNtbgz8XxXX+PLek3HkV9+d/O53NX19hsgP/vZP/1v/ -f//zX373Xz/8+N8nT/6v8Dl+t/y/3/8/n8y//2fF7/9a/36O3+vj/+f/wu+n6/P/4//7vzGanz9+ -9PoRn6BGi4BA8t2T//7FrLRfhJdxv3sSR9+e/eUpgnh/OngZH6OX8YtQtXeLFrhKfP4P54+ev/rL -i/Nnt6IjF1e7qm6cR+r1OPebR6/7Izx/tRmKffbib2cPHn7zehbrrH7S4xfPhgKbFe25Fu+ftg6W -9HtKg2nAl0+ef/PiyfPXu7f71+XtJD5/8frR67OH3/bd7ZE9obPrPP/p2cmLl0/Oth7w1emjp2f3 -nzw/m4/WlSj/14e/eXTaR3TvTb4+++v52ThtmrZO/Obs/PTMnnrzog+WF90+8cHGiQeFL4XPPMDR -yYvz52fnr+A+vHx951p//3rceJJbWZNbV7yyzbKejn2y//TqennSw/512L/ueP/6+LXSdz88evzi -54P5+TEu348sdKT/vQ8eQG2bX5+/eHk01svlm+bi0IvhJBvXu+qWmceO+eenP5lJd1xmiNyLl49O -Lx2/t6cieHX69HzDJj19dX46jF09xd/OzmX6pXl/f/zo/MdN6/nloyeb1/nz0+ePN6/zw4vz//5Q -+A3fsxr/f7r80U9PX/+/16Ku+XY9LS7movr/uXvP7mRyrUH0fj5r+T8YsMmhqsg5Z2wwyeAAJhkw -0YTu0/NhfvtIqqQqKhGeuT3v6XX8AKXSlrZ21t6SZFWA7FE2j8lisJ9dj5O7AwK8Rz954U/95826 -tgMvzNdTh4P5PTUBbFEDTgPwx+jR1IY0APif+b0OniPzE2DgE65aZw+nK/z57j+1kWBq5tfZ/DAR -/I4oH+AdKB3ud5KtNzenn7rl+/pkjL0ieNSdLJeATemnpPgpneDNPyTwh+l/BvwzUvgstTxOsNEI -nj0NpsCFGrCPnSRztAjMAqFbRcFPT1HofXWjQeK+DD7y40cNA162xygBmgZhS/BbOYo3hBmQQWHD -AOpS3NDLzxq18sJWELywmdt7Chn8JobsJFDFBhwn0xDOhpsL347C0R2lCKaVCLDTK2jmlWvmF7bz -e2XaoavCSDonlGkboNHNNebRjZDtZvAIPtDtg2jmHCrdokEw/4jG4RciCV3Eh4r/uKYBgh2GR9jW -j0rZeCqK+lFLiHqJueEN0czQcuINSXZCBA8czvwJzqcb9QqakkwNDvyDN6XJk4KNKS+OABIfKE/I -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 -Y5PT0RVBqFPV4dWrtx/+0dj6L4/kVoE= - -</i:pgf> -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/windowcount.css --- a/ginebra/chrome/bedrockchrome/windowcount.snippet/windowcount.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ - -#WindowCountBarId { - width:100%; -} - -/* Table */ -#wcrow { - table-layout:fixed; - width:100%; - border: 0; - border-spacing: 0; - padding: 0; - -} - -/* Cell image */ -.wcicon { - height:10; - width:10; - margin-right:10px; - margin-left:10px; - margin-top:8px; - margin-bottom:6px; -} - -/* Table cells */ -#wcfirst { - overflow:hidden; -} - -#wclast { - overflow:hidden; -} - -#wccontent { - text-align:center; - overflow:hidden; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/windowcount.snippet/windowcount.js --- a/ginebra/chrome/bedrockchrome/windowcount.snippet/windowcount.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ -/* This snippet is used to display the circles indicating the number of windows open. - * Current window is indicated using filled in circle and others by an empty circle. - * In portrait mode, the snippet is placed below the status bar while in landscape - * mode, it is overlaid on the status bar - * Note: When overlaying the snippet there were some issues repainting when the background was set to none - * and hence a table with three cells are being used - the width of first and last cells match the - * area we need to see from the status bar and their backgrounds are set to none. The middle cell is - * used to display the circles and its bakground changes between black and white based - * on the display mode. - */ - -// -// INIT the WindowCount snippet -// -function WindowCountBar(id) -{ - - this.id = id; - - this.begin = - '<table id="wcrow" align=center >'+ - '<tr>'+ - '<td id="wcfirst" style="background-color: transparent;">'+ - '</td>'+ - '<td id="wccontent">'; - - this.filledimg = - '<img class="wcicon" src="windowcount.snippet/icons/filledcircle.png" >' ; - - this.emptyimg = - '<img class="wcicon" src="windowcount.snippet/icons/emptycircle.png" >' ; - - this.end = - '</td>'+ - '<td id="wclast" style="background-color: transparent;">'+ - '</td>'+ - '</tr>'+ - '</table>' ; - - this.InitWCBar = function() { - this.wcUpdateWindowHtml(); - this.setId(); - } - - /* To identify the class. This class can also be identified through the - * global variable wcbar which saves the instance when initialized - * in chrome.html - */ - this.setId = function () { - el = document.getElementById(this.id); - if(el.wcChrome) { - delete eldom.wcChrome; - } - el.wcChrome = this; - - } - - this.wcUpdateWindowHtml = function() { - - //window.chrome.alert("wcUpdateWindowHtml "+ window.pageController.pageCount()); - - /* Generate html based on the number of windows open */ - switch(window.pageController.pageCount()) { - case 1: - this.wcOneWindow(); - break; - case 2: - this.wcTwoWindows(); - break; - case 3: - this.wcThreeWindows(); - break; - case 4: - this.wcFourWindows(); - break; - case 5: - this.wcFiveWindows(); - break; - default : - break; - } - this.setProps(); - - } - - this.wcOneWindow = function() { - - var htmlText = '' + - this.begin + this.filledimg + this.end; - - var el = document.getElementById("wcrow"); - if (el ) { - el.innerHTML = htmlText; - } - else { - document.write(htmlText); - } - } - - this.wcTwoWindows = function() { - var htmlText = '' + - this.begin + this.emptyimg + this.emptyimg + this.end; - - this.setHtmlText(htmlText) - - - } - - this.wcThreeWindows = function() { - var htmlText = '' + - this.begin + this.emptyimg + this.emptyimg + this.emptyimg+ this.end; - this.setHtmlText(htmlText) - } - - this.wcFourWindows = function() { - var htmlText = '' + - this.begin + this.emptyimg + this.emptyimg + this.emptyimg + this.emptyimg + this.end; - - this.setHtmlText(htmlText) - } - - this.wcFiveWindows = function() { - var htmlText = '' + - this.begin + this.emptyimg + this.emptyimg + this.emptyimg + this.emptyimg + this.emptyimg + this.end; - - this.setHtmlText(htmlText) - } - - this.setHtmlText = function(htmlText) { - - var el = document.getElementById("wcrow"); - if (el ) { - el.innerHTML = htmlText; - } - else { - document.write(htmlText); - } - this.setCurrentIndex(); - } - - this.setCurrentIndex = function(){ - var el = document.getElementById("wcrow"); - Icons = el.getElementsByTagName("img"); - - Icons[window.pageController.currentPageIndex].setAttribute('src', "windowcount.snippet/icons/filledcircle.png"); - } - - - this.setSnippetPosition = function(mode) { - if (window.snippets.WindowCountBarId ) { - if (mode == "portrait") { - window.snippets.WindowCountBarId.anchor = "AnchorTop"; - window.snippets.WindowCountBarId.anchorOffset = 27; - document.getElementById("WindowCountBarId").style.backgroundColor='white'; - - - } - else if (mode == "landscape") { - window.snippets.WindowCountBarId.anchor = "AnchorNone"; - window.snippets.WindowCountBarId.setPosition(0, 0); - document.getElementById("WindowCountBarId").style.backgroundColor='transparent'; - } - - } - } - - - /* Private method that sets the properties: - * set the widht of first and last cells, - * set the background of middle cell based on - * display mode - */ - this.setProps = function() { - var leftW = document.getElementById("strength").offsetWidth + - document.getElementById("title").offsetWidth; - - var rightW = document.getElementById("clock").offsetWidth + - document.getElementById("battery").offsetWidth; - - if (window.snippets.WindowCountBarId ) { - document.getElementById("wcfirst").width = leftW; - document.getElementById("wclast").width = rightW; - - if (window.chrome.displayMode == "portrait" ) { - document.getElementById("wccontent").style.backgroundColor='white'; - } - else { - // match status bar style (transparent doesn't repaint/refresh correctly) - document.getElementById("wccontent").style.background='-webkit-gradient(linear, left top, left bottom,color-stop(0%,#111122),color-stop(100%,#111144))'; - } - } - - } - - /* Initialize */ - this.InitWCBar(); - - /* Slots */ - window.chrome.loadComplete.connect( - function() { - document.getElementById('WindowCountBarId').wcChrome.setSnippetPosition(window.chrome.displayMode); - window.snippets.updateGeometry(); - } - ); - - /* Geometry is updated when there is a change in display mode. Here, we - * just need to set our attributes - */ - window.chrome.onDisplayModeChangeStart.connect( - function(mode) { - document.getElementById('WindowCountBarId').wcChrome.setSnippetPosition(mode); - } - ); - - window.chrome.onDisplayModeChanged.connect( - function(mode) { - document.getElementById('WindowCountBarId').wcChrome.setProps(); - } - ); - - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/svg_zoombar_convert.sh --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/svg_zoombar_convert.sh Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#!/bin/sh - - -# toolbar icons -ICON_WIDTH=40 -ICON_HEIGHT=40 - -# toolbar icon borders -#ICON_WIDTH=1 -#ICON_HEIGHT=30 - -echo -echo "Usage: $0 <list of svg files to convert>" -echo "This script converts svg icons into png icons with w=$ICON_WIDTH h=$ICON_HEIGHT" -echo "DPI is default, 90dpi" -echo "Edit the script to change the size\n" -echo "... Requires librsvg2-bin package from ubuntu\n" - -echo "CONVERTING the files listed below:" - -for i in $*; do - rsvg-convert -w $ICON_WIDTH -h $ICON_HEIGHT $i -o `echo $i | sed -e s/svg$/png/` - echo $i; -done - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,428 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.02" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="44" - inkscape:window-y="44" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch50036" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject50038"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g50040"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50079" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop50081" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop50083" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop50089" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop50091" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop50098" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop50100" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50104" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50106" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_disabled.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_disabled.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,363 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_pushed.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_pushed.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom+_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,445 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom+.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata50113"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs50111"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective50115" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><filter - id="filter2865" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix2867" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix2869" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.02" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="526" - inkscape:window-y="265" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch50036" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)" - style="filter:url(#filter2865)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject50038"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g50040"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop50044" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop50046" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50050" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50052" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50056" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop50058" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop50060" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop50062" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop50064" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop50066" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop50068" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop50070" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop50072" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle50074" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50079" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop50081" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop50083" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop50089" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop50091" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop50098" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop50100" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop50104" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop50106" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_)" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,431 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata49866"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs49864"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective49868" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.1553062" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="154" - inkscape:window-y="98" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch49789" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject49791"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g49793"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop49797" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop49799" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49803" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49805" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49809" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop49811" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop49813" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop49815" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop49817" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop49819" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop49821" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop49823" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop49825" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle49827" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49832" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop49834" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop49836" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop49842" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop49844" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop49851" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop49853" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49857" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49859" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_disabled.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_disabled.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_pushed.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_pushed.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_pushed.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom-_pushed.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,448 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom-.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata49866"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs - id="defs49864"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective49868" /><linearGradient - inkscape:collect="always" - xlink:href="#path2262_2_" - id="linearGradient2863" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)" - x1="3874.0303" - y1="-12473.0029" - x2="3874.0303" - y2="-12465.3691" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2865" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /><filter - id="filter3107" - inkscape:label="Invert" - x="0" - y="0" - width="1" - height="1" - inkscape:menu="Color" - inkscape:menu-tooltip="Invert colors" - color-interpolation-filters="sRGB"><feColorMatrix - id="feColorMatrix3109" - type="saturate" - values="1" - result="fbSourceGraphic" /><feColorMatrix - id="feColorMatrix3111" - in="fbSourceGraphic" - values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 " /></filter></defs><sodipodi:namedview - inkscape:window-height="675" - inkscape:window-width="678" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - showgrid="false" - inkscape:zoom="2.1553062" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="154" - inkscape:window-y="179" - inkscape:current-layer="Layer_1" - inkscape:window-maximized="0" /> -<switch - id="switch49789" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)" - style="filter:url(#filter3107)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject49791"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g49793"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - - <linearGradient - id="path2262_2_" - gradientUnits="userSpaceOnUse" - x1="3874.0303" - y1="-12473.003" - x2="3874.0303" - y2="-12465.369" - gradientTransform="matrix(1.8451,0,0,-1.834,-7147.9141,-22867.926)"> - <stop - offset="0" - style="stop-color:#FEC35E" - id="stop49797" /> - <stop - offset="1" - style="stop-color:#B84C26" - id="stop49799" /> - <a:midPointStop - offset="0" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FEC35E" /> - <a:midPointStop - offset="1" - style="stop-color:#B84C26" /> - </linearGradient> - <path - id="path2262_4_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:url(#linearGradient2863);stroke:#c45f28;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49803" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49805" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_3_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2865)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49809" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop49811" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop49813" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop49815" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop49817" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop49819" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop49821" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop49823" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop49825" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle49827" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976801" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49832" /> - <stop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" - id="stop49834" /> - <stop - offset="1" - style="stop-color:#214B88" - id="stop49836" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#214B88;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#214B88" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#424441;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c07e2a;stroke:#8e5b24;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop49842" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop49844" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#8e5b24;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#8e5b24;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - - <linearGradient - id="path2262_3_" - gradientUnits="userSpaceOnUse" - x1="167.39751" - y1="-134.248" - x2="167.39751" - y2="-143.17619" - gradientTransform="matrix(1.8451,0,0,-1.834,-268.0798,-203.3013)"> - <stop - offset="0" - style="stop-color:#F79420" - id="stop49851" /> - <stop - offset="0.9831" - style="stop-color:#A16427" - id="stop49853" /> - <a:midPointStop - offset="0" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.5" - style="stop-color:#F79420" /> - <a:midPointStop - offset="0.9831" - style="stop-color:#A16427" /> - </linearGradient> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:url(#path2262_3_);stroke:#7f5c24;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_2_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop49857" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop49859" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_2_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - overflow="visible" - style="overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom_disabled.png Binary file ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom_disabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom_disabled.svg --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/icons/zoom_disabled.svg Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,367 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - x="0px" - y="0px" - width="100px" - height="100px" - viewBox="0 0 100 100" - xml:space="preserve" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="zoom_disabled.svg"><metadata - id="metadata71"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs69"><inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 50 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="100 : 50 : 1" - inkscape:persp3d-origin="50 : 33.333333 : 1" - id="perspective73" /><linearGradient - inkscape:collect="always" - xlink:href="#path3267_1_" - id="linearGradient2881" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5" /></defs><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="678" - inkscape:window-height="489" - id="namedview67" - showgrid="false" - inkscape:zoom="2.36" - inkscape:cx="50" - inkscape:cy="50" - inkscape:window-x="37" - inkscape:window-y="99" - inkscape:window-maximized="0" - inkscape:current-layer="Layer_1" /> -<switch - id="switch3" - transform="matrix(1.5482273,0,0,1.5482273,-21.675179,-33.288439)"> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject5"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf"> - </i:pgfRef> - </foreignObject> - <g - i:extraneous="self" - id="g7"> - <symbol - id="minus" - viewBox="-20 -7 40 14"> - <path - id="path2262_3_" - d="m 19.5,6.5 v -13 h -39 v 13 h 39 z" - style="fill:#b2b3b3;stroke:#7b7b7b;stroke-linejoin:round" /> - <linearGradient - id="path3267_1_" - gradientUnits="userSpaceOnUse" - x1="8165.5" - y1="-8236.5" - x2="8165.5" - y2="-8196.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop12" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop14" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267_2_" - d="m -18.5,5.5 v -11 h 37 v 11 h -37 z" - style="opacity:0.4;fill:none;stroke:url(#linearGradient2881)" /> - </symbol> - <radialGradient - id="SVGID_1_" - cx="46.295399" - cy="53.794899" - r="31.7957" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop18" /> - <stop - offset="0.4337" - style="stop-color:#FCFCFC" - id="stop20" /> - <stop - offset="0.5899" - style="stop-color:#F5F5F5" - id="stop22" /> - <stop - offset="0.7013" - style="stop-color:#EBEBEC" - id="stop24" /> - <stop - offset="0.7913" - style="stop-color:#DCDEDF" - id="stop26" /> - <stop - offset="0.8684" - style="stop-color:#CACCCE" - id="stop28" /> - <stop - offset="0.9355" - style="stop-color:#B4B6B8" - id="stop30" /> - <stop - offset="0.9959" - style="stop-color:#9B9DA0" - id="stop32" /> - <stop - offset="1" - style="stop-color:#999B9E" - id="stop34" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.87" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#999B9E" /> - </radialGradient> - <circle - cx="46.294998" - cy="53.796001" - r="31.795" - id="circle36" - style="fill:url(#SVGID_1_);stroke:#787878" - sodipodi:cx="46.294998" - sodipodi:cy="53.796001" - sodipodi:rx="31.795" - sodipodi:ry="31.795" - d="m 78.089998,53.796001 c 0,17.559894 -14.235106,31.795001 -31.795,31.795001 -17.559893,0 -31.795,-14.235107 -31.795,-31.795001 0,-17.559893 14.235107,-31.795 31.795,-31.795 17.559894,0 31.795,14.235107 31.795,31.795 z" /> - <g - id="g4042" - transform="translate(1.0012214,1.0001413)"> - <path - id="path4029" - nodetypes="ccccc" - d="m 50.326,61.213 1.954,-1.953 3.25,3.254 -1.949,1.95 -3.255,-3.251 z" - style="fill:#707d82" /> - - <radialGradient - id="path2982_1_" - cx="23.976299" - cy="79.8358" - r="13.6992" - gradientTransform="matrix(1.1394,0,0,-1.1394,12.6024,139.8193)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop41" /> - <stop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" - id="stop43" /> - <stop - offset="1" - style="stop-color:#D8D9DA" - id="stop45" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF;stop-opacity:0" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="0.5" - style="stop-color:#BEC0C2;stop-opacity:0.0888" /> - <a:midPointStop - offset="1" - style="stop-color:#D8D9DA" /> - </radialGradient> - - <path - id="path2982" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="opacity:0.6;fill:url(#path2982_1_)" /> - - <path - id="path2994" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 56.181,48.854 c 0,8.982 -7.276,16.26 -16.259,16.26 -8.98,0 -16.259,-7.277 -16.259,-16.26 l 0,0 c 0,-8.98 7.279,-16.259 16.259,-16.259 8.983,10e-4 16.259,7.279 16.259,16.259 z" - style="fill:none;stroke:#7b7b7b;stroke-width:1.70039999;stroke-linecap:round" /> - - <path - id="rect3080" - nodetypes="ccccc" - transform-center-y="14.5" - transform-center-x="-14.499995" - d="m 52.28,63.814 c -0.036,-1.279 1.323,-2.513 2.601,-2.602 3.598,2.619 6.919,5.401 9.756,8.455 0.271,3.036 -1.286,4.042 -3.902,3.901 -3.1,-2.838 -6.002,-5.943 -8.455,-9.754 z" - style="fill:#c9c9c9;stroke:#6d6d6d;stroke-linecap:round;stroke-linejoin:round" /> - - <linearGradient - id="path1995_1_" - gradientUnits="userSpaceOnUse" - x1="-63.846401" - y1="783.00092" - x2="-64.638603" - y2="797.60358" - gradientTransform="matrix(0.8155,-0.3855,0.3786,0.8008,-204.2144,-602.2139)"> - <stop - offset="0" - style="stop-color:#EEEEED" - id="stop51" /> - <stop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" - id="stop53" /> - <a:midPointStop - offset="0" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="0.5" - style="stop-color:#EEEEED" /> - <a:midPointStop - offset="1" - style="stop-color:#EEEEED;stop-opacity:0" /> - </linearGradient> - - <path - id="path1995" - nodetypes="ccsc" - transform-center-y="2.7205539" - transform-center-x="-0.4563408" - d="m 51.092,43.572 c -2.885,12.158 -19.21,0.451 -22.343,10.565 2.916,6.165 10.287,8.804 16.451,5.888 6.17,-2.913 8.808,-10.285 5.892,-16.453 z" - style="opacity:0.8;fill:url(#path1995_1_)" /> - - <path - id="path2944" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - transform-center-y="-1.1313152" - transform-center-x="5.456351" - open="true" - end="4.2666097" - start="2.3770938" - d="m 27.991,54.029 c -2.857,-6.588 0.167,-14.248 6.757,-17.105 1.269,-0.55 2.621,-0.896 4,-1.02" - style="opacity:0.9;fill:none;stroke:#939393;stroke-width:1.06299996;stroke-linecap:round" /> - - <path - id="path3042" - ry="10.724427" - rx="10.532116" - cy="24.724428" - cx="60.532116" - type="arc" - d="m 55.53,48.854 c 0,8.62 -6.989,15.609 -15.608,15.609 -8.62,0 -15.61,-6.989 -15.61,-15.609 l 0,0 c 0,-8.619 6.99,-15.608 15.61,-15.608 8.619,0 15.608,6.989 15.608,15.608 z" - style="fill:none;stroke:#939393;stroke-width:0.97420001;stroke-linecap:round" /> - </g> - <g - id="layer1" - display="none" - style="display:none"> - <path - id="path2262" - display="inline" - d="M 37.736,46.595 V 40.5 h 6.095 v 6.095 h 6.095 v 6.095 h -6.095 v 6.095 H 37.736 V 52.69 h -6.095 v -6.095 h 6.095 z" - style="fill:#a9a8a8;stroke:#6b6b6b;stroke-linejoin:round;display:inline" /> - <linearGradient - id="path3267_3_" - gradientUnits="userSpaceOnUse" - x1="24.5" - y1="95.5" - x2="24.5" - y2="55.5"> - <stop - offset="0" - style="stop-color:#FFFFFF" - id="stop61" /> - <stop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" - id="stop63" /> - <a:midPointStop - offset="0" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="0.5" - style="stop-color:#FFFFFF" /> - <a:midPointStop - offset="1" - style="stop-color:#FFFFFF;stop-opacity:0" /> - </linearGradient> - <path - id="path3267" - display="inline" - d="m 38.205,40.969 v 5.625 c -0.003,0.258 -0.211,0.465 -0.469,0.469 H 32.11 v 5.157 h 5.626 c 0.257,0.004 0.465,0.211 0.469,0.469 v 5.627 h 5.157 v -5.627 c 0.003,-0.258 0.212,-0.465 0.469,-0.469 h 5.626 v -5.157 h -5.626 c -0.257,-0.004 -0.466,-0.211 -0.469,-0.469 v -5.625 h -5.157 z" - style="opacity:0.4;fill:none;stroke:url(#path3267_3_);display:inline" /> - </g> - - <use - xlink:href="#minus" - width="40" - height="14" - id="XMLID_1_" - x="-20" - y="-7" - transform="matrix(0.4798,0,0,-0.5089,40.7832,49.5288)" - display="none" - overflow="visible" - style="display:none;overflow:visible" /> - </g> -</switch> - -</svg> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/zoombar.css --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/zoombar.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -#ZoomBarId { - width: 110px; - height: 55px; -} - -#zoomBarSpan { - text-align: center; - background: lightgrey; - border-top: 3px solid black; - border-right: 3px solid black; - border-bottom: 3px solid black; - border-left: 3px solid black; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - } - -.zoomBarBtn { - width: 40px; - height: 40px; - padding: 5px; - } - -#zoomBarBtnIn { - } - -#zoomBarBtnOut { - } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/bedrockchrome/zoombar.snippet/zoombar.js --- a/ginebra/chrome/bedrockchrome/zoombar.snippet/zoombar.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -function ZoomBar() -{ - // Private Methods - //! Write status bar HTML code to document. - function _zoombar_write() { - var html = ''+ - '<div id="zoomBarSpan">'+ - '<img class="zoomBarBtn" id="zoomBarBtnIn">'+ - '<img class="zoomBarBtn" id="zoomBarBtnOut">'+ - '</div>'; - document.write(html); - } - - function _setActions () { - new ActionButton("zoomBarBtnIn", - "zoombar.snippet/icons/zoom+.png", - "zoombar.snippet/icons/zoom+_pushed.png", - "zoombar.snippet/icons/zoom+_disabled.png", - window.webView.actions.zoomIn); - - new ActionButton("zoomBarBtnOut", - "zoombar.snippet/icons/zoom-.png", - "zoombar.snippet/icons/zoom-_pushed.png", - "zoombar.snippet/icons/zoom-_disabled.png", - window.webView.actions.zoomOut); - } - - function _chromeLoadComplete () { - _setActions(); - } - - _zoombar_write(); - window.chrome.loadComplete.connect(_chromeLoadComplete); -} - - - - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/boston-chrome.html --- a/ginebra/chrome/demochrome/boston-chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - - function onLoad() { - window.chrome.setAnchor("BottomChromeId","AnchorBottom"); - window.chrome.setVisibilityAnimator("BottomChromeId", "G_VISIBILITY_FADE_ANIMATOR"); - } - - - </script> - - <link id="CSSLink" rel="stylesheet" type="text/css" href="css/chromeStyleBoston.css" /> - - </head> - - <body onload="onLoad()"> - <div class ="InitialChrome"> - <div class = "BottomChrome" id="BottomChromeId" style="background-image:url('images/Boston.png');background-repeat:no-repeat;"> - <button id="Button1" onclick="window.pageController.currentLoad('http://www.google.com/news/image?p2=1&ned=us&hl=en&q=boston&imv=1')"/> - <button id="Button2" onclick="window.pageController.currentLoad('http://www.boston.com/ae/movies')"/> - <button id="Button3" onclick="window.pageController.currentLoad('http://www.boston.com/sports')"/> - <button id="Button4" onclick="window.pageController.currentLoad('http://www.google.com/search?hl=en&q=weather+boston+ma&btnG=Search&aq=f&oq=&aqi=g10')"/> - <button id="Button5"/> - <button id="Button6" onclick="window.chrome.loadChrome('chrome/chrome.html');"/> - - </div> - </div> - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/chrome.html --- a/ginebra/chrome/demochrome/chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,329 +0,0 @@ -<html> - <head> - <script type="text/javascript" src="../js/Bind.js"></script> - <script type="text/javascript" src="../js/ActionButton.js"></script> - - <script type="text/javascript"> - - function loadToMainWindow(url){ - window.pageController.currentLoad(url); - } - - - function newStyle(style){ - //alert("New Style: " + style); - var styleLink = document.getElementById("CSSLink"); - //alert (styleLink); - styleLink.href = style; - window.chrome.toggleVisibility("SettingsChromeId"); - } - - - var topBar = false; - - function topToggle() - { - if(topBar){ - window.chrome.toggleVisibility("TopChromeId"); - } - else { - window.chrome.setAnchor("TopChromeId", "AnchorTop"); - window.chrome.show("TopChromeId", 0,0); - topBar = true; - } - } - - var settingsPopUp = false; - - function toggleSettings() - { - if(settingsPopUp){ - window.chrome.toggleVisibility("SettingsChromeId"); - } - else { - window.chrome.show("SettingsChromeId", 10,120); - window.chrome.setAnchor("SettingsChromeId", "AnchorCenter"); - settingsPopUp = true; - } - } - - function onLoad() { - settingsPopUp = false; - // Load the emergency backup page. - loadToMainWindow("chrome/demochrome/static.html"); - // Now load the real starting page. - loadToMainWindow("http://www.google.com"); - window.chrome.setAnchor("TopChromeId", "AnchorTop"); - window.chrome.setVisibilityAnimator("TopChromeId", "G_VISIBILITY_FADE_ANIMATOR"); - window.chrome.setAnchor("BottomChromeId","AnchorBottom"); - window.chrome.setVisibilityAnimator("BottomChromeId", "G_VISIBILITY_FADE_ANIMATOR"); - - // Attach buttons to the underlying QActions. - new ActionButton("backButton", - "images/backArrow.png", - "images/backArrowDown.png", - "images/backArrowDisabled.png", - window.pageController.actions.back); - new ActionButton("forwardButton", - "images/forwardArrow.png", - "images/forwardArrowDown.png", - "images/forwardArrowDisabled.png", - window.pageController.actions.forward); - new ActionButton("stopButton", - "images/stop.png", - "images/stopDown.png", - "images/stopDisabled.png", - window.pageController.actions.stop); - new ActionButton("reloadButton", - "images/reload.png", - "images/reloadDown.png", - "images/reloadDisabled.png", - window.pageController.actions.reload); - new ActionButton("zoomInButton", - "images/zoomIn.png", - "images/zoomInDown.png", - "images/zoomInDisabled.png", - window.webView.actions.zoomIn); - new ActionButton("zoomOutButton", - "images/zoomOut.png", - "images/zoomOutDown.png", - "images/zoomOutDisabled.png", - window.webView.actions.zoomOut); - } - - - var pageInfoShowing = false; - - function flipPageInfo() { - if(!pageInfoShowing){ - document.getElementById("pageInfo_UrlId").value = window.viewManager.pageController.currentDocUrl; - document.getElementById("pageInfo_TitleId").value = window.viewManager.pageController.currentDocTitle; - window.chrome.flipFromCurrentView("PageInfoId"); - pageInfoShowing = true; - } else { - window.chrome.flipToCurrentView("PageInfoId"); - pageInfoShowing = false; - } - } - - function showGoAnywhere() { - window.viewManager.showContent("goAnywhereView"); - window.viewManager.goAnywhereView.setPosition(40, 40); - window.viewManager.goAnywhereView.done.connect( - function() { - window.viewManager.showContent("webView"); - } - ); - } - - function chromeSelect(){ - var p = document.getElementsByName("ChromeSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - - return p[i].value; - } - } - } - - function styleSelect() { - var p = document.getElementsByName("StyleSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - function HTML5Tests(){ - var p = document.getElementsByClassName("TopChrome"); - for(i = 0; i < p.length; i ++){ - alert (p[i].getAttribute("data-Ginebra.Anchor")); - } - } - - function showHistory() { - window.viewManager.showContent("historyView"); -// window.viewManager.historyView.setPosition(40, 40); - - window.chrome.hide("TopChromeId"); - window.chrome.hide("BottomChromeId"); - //topToggle(); - //bottomToggle(); - - window.viewManager.historyView.done.connect( - function() { - window.chrome.show("TopChromeId"); - window.chrome.show("BottomChromeId"); - window.viewManager.showContent("webView"); -// window.viewManager.webView.setPosition(0, 0); - //topToggle(); - //bottomToggle(); - } - ); - } - - // This function is for highlighting text in the go to entry - function selectAll(el) - { - el.select(); - } - - - window.pageController.loadStarted.connect( - function() { - document.getElementById("PBar").style.width = "0%"; - //topToggle(); - } - ); - - window.pageController.loadProgress.connect( - function(percent) { - var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - - window.pageController.loadFinished.connect( - function(ok) { - document.getElementById("PBar").style.width = "0%"; - //topToggle(); - } - ); - - window.pageController.networkRequestError.connect( - function(reply) { - window.chrome.alert("onNetworkRequestError: " + reply.error()); - } - ); - - window.pageController.titleChanged.connect( - function(title) { - // TBD - } - ); - - window.pageController.partialUrlChanged.connect( - function(partialUrl) { - document.getElementById("urlBox").value = partialUrl; - } - ); - - window.chrome.onDisplayModeChanged.connect( - function(orientation){ - window.chrome.alert("onDisplayModeChanged: " + orientation); - } - ); - - window.chrome.loadComplete.connect( - function(){ - window.chrome.alert("loadComplete"); - onLoad(); - } - ); - - </script> - - <link rel="stylesheet" id = "CSSLink" type="text/css" href="css/chromeStyleBlack.css" /> - </head> - - <body> - <div class ="InitialChrome"> - <div class = "GinebraSnippet" id="TopChromeId" name="TopChrome" - data-GinebraAnchor = "AnchorTop" data-GinebraVisible = "true" - style="width:100%"> - <form name = "gotoUrlForm" style="width: 100%"> - <span id="PBarWrapper" class="ProgressBarWrapper" style="position: absolute; top: 3px; left:4px; height:20px"> - <span id="PBar" class="ProgressBar" style="position:absolute; left: 1px; height: 18px;"> - </span> - <input type ="text" - class = "Text" - id = "urlBox" - name = "textBox" - style = "position: absolute; width: 260px; height: 16px" - value="http://www.google.com/"/> - </span> - <span style="position: absolute; left: 270px; display: inline"> - <input type = "button" class="Button" value="Go" style="display: inline" - onclick="loadToMainWindow(document.gotoUrlForm.textBox.value)"/> -  - <input type = "button" class="Button" value="Min" style="display: inline" - onclick = "window.chrome.toggleVisibility('TopChromeId');window.chrome.toggleVisibility('BottomChromeId')"/> - </span> - </form> - </div> - <div class = "GinebraSnippet" id="BottomChromeId" name="BottomChrome" data-GinebraAnchor="AnchorBottom" data-ginebraVisible="true"> - <span class="ButtonRow" style="width:100%"> - <img id="backButton" src="images/backArrow.png" align="center" - style="width: 18px" class="ButtonImage"/> - <img id="forwardButton" src="images/forwardArrow.png" align="center" - style="width: 18px" class="ButtonImage"/> - <img id="stopButton" src="images/stop.png" align="center" - style="width: 18px" class="ButtonImage"/> - <img id="reloadButton" src="images/reload.png" align="center" - style="width: 20px" class="ButtonImage" - <img id="zoomInButton" src="images/zoomIn.png" align="center" - style="width: 20px" class="ButtonImage"/> - <img id="zoomOutButton" src="images/zoomOut.png" align="center" - style="width: 20px" class="ButtonImage"/> - <img src="images/history.png" align="center" class="ButtonImage" onclick="showHistory()"/> - <img src="images/info.png" align="center" style="width: 20px" class="ButtonImage" onclick="flipPageInfo()"/> - <img src="images/star.png" align="center" style="width: 20px" class="ButtonImage" onclick="showGoAnywhere()"/> - <img src="images/wrench_icon.jpg" align="center" class="ButtonImage" onclick="toggleSettings()"/> - <img src="images/red_sox_logo.png" align="center" class="ButtonImage" onclick="window.chrome.loadChrome('chrome/boston-chrome.html');"/> - </div> - - <div class = "GinebraSnippet PageInfo" id="PageInfoId"> - <div class = "PageInfoInner"> - <form> - Title: <input id="pageInfo_TitleId" type="text"></br> - URL: <input id="pageInfo_UrlId" type="text"></br> - Text Language: <input id="language" type="text"></br> - </form> - <div align="right" style="margin-right: 20px"> - <input type = "button" class="Button" value="OK" onclick="flipPageInfo()"/> - </div> - </div> - </div> - - - <div class = "PopChrome" id="SettingsChromeId"> - - <h3>Chrome settings</h3> - <hr/> - Chrome: - <br/> - Simple - <input type ="radio" - checked = "checked" - name = "ChromeSelection" - value="chrome.html"/> - - <button type="button" class="Button" onclick="window.chrome.loadChrome('chrome/' + chromeSelect());">Update</button> - - <br/> - Veggie - <input type ="radio" - name = "ChromeSelection" - value="veggie-chrome.html"/> - <hr/> - Style: - <br/> - Simple - <input type ="radio" - name = "StyleSelection" - value="chromeStyleFlat.css"/> - <button type="button" class="Button" onclick="newStyle('css/' + styleSelect());">Update</button> - - <br/> - Curved - <input type ="radio" - checked = "checked" - name = "StyleSelection" - value="chromeStyleBlack.css"/> - <br/> - </div> - - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/css/chromeStyleBlack.css --- a/ginebra/chrome/demochrome/css/chromeStyleBlack.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ - body { - margin:0px; - } - - #TopChromeId { - background: -webkit-gradient(linear, left top, left bottom, - from(#555), to(#111), - color-stop(0.45, #666), color-stop(0.45, #444)); - width: 100%; - height: 28px; - color:white; - font-family:verdana; - font-size:14px; - } - - #BottomChromeId { - background: -webkit-gradient(linear, left top, left bottom, - from(#555), to(#111), - color-stop(0.45, #666), color-stop(0.45, #444)); - width: 100%; - height: 28px; - color:white; - font-family:verdana; - font-size:14px; - } - - #SettingsChromeId { - background-color: gray; - color: white; - width: 300px; - height: 240px; - padding: 20px; - } - - #PageInfoId { - background: -webkit-gradient(linear, left top, left bottom, - from(#555), to(#222), - color-stop(0.3, #666), color-stop(0.3, #555)); - width: 240px; - padding: 20px; - } - - .PageInfoInner { - margin: 5px; - } - - .ProgressBarWrapper { - width: 260; - border-style:none; - background-color: #444; - } - - .ProgressBar { - width: 0%px; - background-color: #777; - padding-right: 0px; - } - - Button, input.Button { - border-style:none; - color:#eee; - height: 22px; - margin-top: 2px; - background: -webkit-gradient(linear, left top, left bottom, - from(#666), to(#444), - color-stop(0.45, #999), color-stop(0.45, #888)); - } - Text, input.Text { - border-width:0px; - color:#eee; - background-color:transparent; - } - .ButtonImage{ - height: 24px; - width: 24px; - margin-top: 1px; - margin-right: 4px; - margin-left: 4px; - } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/css/chromeStyleBoston.css --- a/ginebra/chrome/demochrome/css/chromeStyleBoston.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ - body { - margin:0px; - } - - .BottomChrome { - //background: Black; - // border-style:solid; - // border-width:2px; - // border-color:white; - width: 100%; - height: 36px; - // color:white; - // font-family:verdana; - // font-size:14px; - // padding-bottom:3px; - // padding-top:2px; - } - - .PopChrome { - background-color: SlateBlue; - border-style:solid; - border-width:2px; - border-color:white; - color: white; - width: 300px; - height: 400px; - padding: 20px; - } - - Button { - margin-top: 3px; - border-width:0px; - height: 30px; - width: 59px; - background: transparent; - } - Img { - //height: 84px; - // width: 84px; - //margin-top: -9px; - } - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/css/chromeStyleFlat.css --- a/ginebra/chrome/demochrome/css/chromeStyleFlat.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ - body { - margin:0px; - } - - #TopChromeId { - background: SeaGreen; - width: 100%; - height: 26px; - color:white; - font-family:verdana; - font-size:14px; - } - - #BottomChromeId { - background: SeaGreen; - width: 100%; - height: 26px; - color:white; - font-family:verdana; - font-size:14px; - } - - #SettingsChromeId{ - background-color: DarkSeaGreen; - color: white; - width: 300px; - height: 260px; - padding: 20px; - } - - #PageInfoId{ - background: SeaGreen - width: 240px; - padding: 20px; - } - - .PageInfoInner { - margin: 5px; - } - - .ProgressBarWrapper { - width: 260; - border-style:none; - background-color: #444; - } - - .ProgressBar { - width: 0%px; - background-color: #777; - padding-right: 0px; - } - - Button, input.Button { - border-style:none; - color:#eee; - height: 22px; - margin-top: 2px; - background: SeaGreen; - } - Text, input.Text { - border-width:0px; - color:#eee; - background-color:transparent; - } - .ButtonImage{ - height: 24px; - width: 24px; - margin-top: 1px; - margin-right: 4px; - margin-left: 4px; - } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/css/chromeStyleGreen.css --- a/ginebra/chrome/demochrome/css/chromeStyleGreen.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ - body { - margin:1px; - } - - .TopChrome { - background: -webkit-gradient(linear, left top, left bottom, from(#242), to(#131), color-stop(0.3, #aca), color-stop(0.5, #575)); - width: 100%; - height: 26px; - color:white; - font-family:verdana; - font-size:14px; - } - - .ProgressBarWrapper { - position: fixed; - width: inherit; - border-style:none; - background-color: #555; - } - - .ProgressBar { - position: fixed; - width: 0%px; - background-color: #F24; - padding-right: 0px; - } - - Button, input.Button { - border-style:none; - color:#eee; - height: 22px; - background: -webkit-gradient(linear, left top, left bottom, from(#242), to(#131), color-stop(0.3, #aca), color-stop(0.5, #575)); -; - } - - Text, input.Text { - border-width:0px; - color:#eee; - background-color:transparent; - } - - .BottomChrome { - background: -webkit-gradient(linear, left top, left bottom, from(#242), to(#131), color-stop(0.3, #aca), color-stop(0.5, #575)); - - width: 100%; - height: 26px; - color:white; - font-family:verdana; - font-size:14px; - - } - - .PopChrome { - background-color:grey; - width: 300px; - height: 400px; - } - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/css/chromeStyleTransparent.css --- a/ginebra/chrome/demochrome/css/chromeStyleTransparent.css Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - body { - margin:1px; - } - - #TopChromeId { - // background: transparent; - //opacity: 0.5; - width: 100%; - height: 36px; - //color:white; - font-family:verdana; - font-size:14px; - } - - #TopChromeId img { - opacity: 1.0; - } - - #BottomChromeId { - // background: transparent; - width: 100%; - height: 36px; - //color:white; - font-family:verdana; - font-size:14px; - } - - .PopChrome { - background-color: DarkSeaGreen; - color: white; - width: 300px; - height: 400px; - padding: 20px; - } - - .PageInfo { - background: DarkSeaGreen; - color: white; - padding: 20px; - } - - .ProgressBarWrapper { - width: 300; - border-style:none; - background-color: SeaGreen; - } - .ProgressBar { - width: 0px; - background-color: Red; - padding-right: 0px; - } - Button, input.Button { - margin: 1px; - border-style:solid; - border-width:1px; - // border-color:white; - color:#eee; - height: 22px; - background: SeaGreen; - } - Text, input.Text { - margin:2px; - border-width:0px; - color:white; - background-color:transparent; - } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/Boston.png Binary file ginebra/chrome/demochrome/images/Boston.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/backArrow.png Binary file ginebra/chrome/demochrome/images/backArrow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/backArrowDisabled.png Binary file ginebra/chrome/demochrome/images/backArrowDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/backArrowDown.png Binary file ginebra/chrome/demochrome/images/backArrowDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/backArrowOver.png Binary file ginebra/chrome/demochrome/images/backArrowOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/carrot.gif Binary file ginebra/chrome/demochrome/images/carrot.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/carrot.png Binary file ginebra/chrome/demochrome/images/carrot.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/corn.gif Binary file ginebra/chrome/demochrome/images/corn.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/corn.png Binary file ginebra/chrome/demochrome/images/corn.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/cuke.gif Binary file ginebra/chrome/demochrome/images/cuke.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/cuke.png Binary file ginebra/chrome/demochrome/images/cuke.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/forwardArrow.png Binary file ginebra/chrome/demochrome/images/forwardArrow.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/forwardArrowDisabled.png Binary file ginebra/chrome/demochrome/images/forwardArrowDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/forwardArrowDown.png Binary file ginebra/chrome/demochrome/images/forwardArrowDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/forwardArrowOver.png Binary file ginebra/chrome/demochrome/images/forwardArrowOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/history.png Binary file ginebra/chrome/demochrome/images/history.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/info.png Binary file ginebra/chrome/demochrome/images/info.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/infoOver.png Binary file ginebra/chrome/demochrome/images/infoOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/lettuce.gif Binary file ginebra/chrome/demochrome/images/lettuce.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/lettuce.png Binary file ginebra/chrome/demochrome/images/lettuce.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/mostly_sunny.gif Binary file ginebra/chrome/demochrome/images/mostly_sunny.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/mostly_sunny.png Binary file ginebra/chrome/demochrome/images/mostly_sunny.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/news.gif Binary file ginebra/chrome/demochrome/images/news.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/news.png Binary file ginebra/chrome/demochrome/images/news.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/onion.gif Binary file ginebra/chrome/demochrome/images/onion.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/onion.png Binary file ginebra/chrome/demochrome/images/onion.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/pepper.gif Binary file ginebra/chrome/demochrome/images/pepper.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/pepper.png Binary file ginebra/chrome/demochrome/images/pepper.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/red_sox_logo.gif Binary file ginebra/chrome/demochrome/images/red_sox_logo.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/red_sox_logo.png Binary file ginebra/chrome/demochrome/images/red_sox_logo.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/red_sox_logo_over.gif Binary file ginebra/chrome/demochrome/images/red_sox_logo_over.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/reload.png Binary file ginebra/chrome/demochrome/images/reload.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/reloadDisabled.png Binary file ginebra/chrome/demochrome/images/reloadDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/reloadDown.png Binary file ginebra/chrome/demochrome/images/reloadDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/reloadOver.png Binary file ginebra/chrome/demochrome/images/reloadOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/star.png Binary file ginebra/chrome/demochrome/images/star.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/stop.png Binary file ginebra/chrome/demochrome/images/stop.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/stopDisabled.png Binary file ginebra/chrome/demochrome/images/stopDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/stopDown.png Binary file ginebra/chrome/demochrome/images/stopDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/stopOver.png Binary file ginebra/chrome/demochrome/images/stopOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/tomato.gif Binary file ginebra/chrome/demochrome/images/tomato.gif has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/tomato.png Binary file ginebra/chrome/demochrome/images/tomato.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/wrench_icon.jpg Binary file ginebra/chrome/demochrome/images/wrench_icon.jpg has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/wrench_icon_over.jpg Binary file ginebra/chrome/demochrome/images/wrench_icon_over.jpg has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomIn.png Binary file ginebra/chrome/demochrome/images/zoomIn.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomInDisabled.png Binary file ginebra/chrome/demochrome/images/zoomInDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomInDown.png Binary file ginebra/chrome/demochrome/images/zoomInDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomInOver.png Binary file ginebra/chrome/demochrome/images/zoomInOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomOut.png Binary file ginebra/chrome/demochrome/images/zoomOut.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomOutDisabled.png Binary file ginebra/chrome/demochrome/images/zoomOutDisabled.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomOutDown.png Binary file ginebra/chrome/demochrome/images/zoomOutDown.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/images/zoomOutOver.png Binary file ginebra/chrome/demochrome/images/zoomOutOver.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/s60-boston-chrome.html --- a/ginebra/chrome/demochrome/s60-boston-chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - function loadToMainWindow(url){ - // alert("Loading:" + url); - window.viewManager.pageController.currentLoad(url); - } - - - function onLoad(){ - loadToMainWindow('http://www.google.com/news/image?p2=1&ned=us&hl=en&q=boston&imv=1'); - window.chrome.setBackgroundColor(0xFF,0xFF,0xFF); - //window.chrome.setVisibilityAnimator("BottomChromeId", "G_VISIBILITY_FLYOUT_ANIMATOR"); - //window.chrome.setAttentionAnimator("Button6", "G_ATTENTION_PULSE_ANIMATOR"); - } - window.chrome.onLoadStarted.connect( - function() { - window.chrome.alert("handleLoadStart"); - //document.getElementById("PBar").style.width = "0%"; - } - ); - window.pageController.loadProgress.connect( - function(percent) { - //var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - //document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - window.pageController.loadFinished.connect( - function(ok) { - //window.chrome.alert("handleLoadFinished: " + ok); - //document.getElementById("PBar").style.width = "0%"; - } - ); - window.pageController.networkRequestError.connect( - function(reply) { - window.chrome.alert("networkRequestError: " + reply.error()); - } - ); - window.pageController.titleChanged.connect( - function(title) { - // TBD - } - ); - window.pageController.currentPageUrlChanged.connect( - function(url){ - document.getElementById("urlBox").value = url; - //window.chrome.toggleAttention("Button6"); - ); - - </script> - - <link id="CSSLink" rel="stylesheet" type="text/css" href="css/chromeStyleBoston.css" /> - - </head> - <body onload="onLoad();"> - <div class ="InitialChrome"> - <div class = "BottomChrome" id="BottomChromeId" style="background-image:url('images/Boston.png');background-repeat:no-repeat;"> - <button id="Button1" onclick="window.pageController.currentLoad('http://www.google.com/news/image?p2=1&ned=us&hl=en&q=boston&imv=1')"/> - <button id = "Button2" onclick="window.pageController.currentLoad('http://www.boston.com/ae/movies')"/> - <button id = "Button3" onclick="window.pageController.currentLoad('http://www.boston.com/sports')"/> - <button id = "Button4" onclick="window.pageController.currentLoad('http://www.google.com/search?hl=en&q=weather+boston+ma&btnG=Search&aq=f&oq=&aqi=g10')"/> - <button id = "Button5" onclick="window.chrome.popToggle('PopChromeId');" - <button id = "Button6" onclick="window.chrome.loadChrome('file:///C:/data/Others/chrome/s60-chrome.html');"/> - - </div> - </div> - - <div class = "PopChrome" id="PopChromeId"> - <h3>Boston Chrome</h3> - </div> - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/s60-chrome.html --- a/ginebra/chrome/demochrome/s60-chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,293 +0,0 @@ -<html> - <head> - <script type="text/javascript" src="../js/ActionButton.js"></script> - - <script type="text/javascript"> - - // Do any snippet initialization in a handler for the chrome.loadComplete signal. - // Note that chrome may not be fully initialized when the html <body onload> event - // is invoked, whereas chrome initialization is guaranteed to be complete when - // this signal is invoked. - - function onChromeComplete() { - window.snippets.BottomChromeId.setVisibilityAnimator("G_VISIBILITY_SLIDE_ANIMATOR"); - window.snippets.TopChromeId.setVisibilityAnimator("G_VISIBILITY_FADE_ANIMATOR"); - - - // Attach buttons to the underlying QActions. - new ActionButton("backButton", - "images/backArrow.png", - "images/backArrowDown.png", - "images/backArrowDisabled.png", - window.pageController.actions.back); - new ActionButton("forwardButton", - "images/forwardArrow.png", - "images/forwardArrowDown.png", - "images/forwardArrowDisabled.png", - window.pageController.actions.forward); - new ActionButton("stopButton", - "images/stop.png", - "images/stopDown.png", - "images/stopDisabled.png", - window.pageController.actions.stop); - new ActionButton("reloadButton", - "images/reload.png", - "images/reloadDown.png", - "images/reloadDisabled.png", - window.pageController.actions.reload); - new ActionButton("zoomInButton", - "images/zoomIn.png", - "images/zoomInDown.png", - "images/zoomInDisabled.png", - window.webView.actions.zoomIn); - new ActionButton("zoomOutButton", - "images/zoomOut.png", - "images/zoomOutDown.png", - "images/zoomOutDisabled.png", - window.webView.actions.zoomOut); - } - - window.chrome.loadComplete.connect( - function(){ - onChromeComplete(); - } - ); - - // Functions used by the settings pop up chrome snippet - - function newStyle(style){ - //alert("New Style: " + style); - var styleLink = document.getElementById("CSSLink"); - //alert (styleLink); - styleLink.href = style; - window.snippets.SettingsChromeId.toggleVisibility(); - } - - function chromeSelect(){ - var p = document.getElementsByName("ChromeSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - - return p[i].value; - } - } - } - - function styleSelect() { - var p = document.getElementsByName("StyleSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - // Functions used by the page info flip chrome - - var pageInfoShowing = false; - - function flipPageInfo() { - if(!pageInfoShowing){ - document.getElementById("pageInfo_UrlId").value = window.pageController.currentDocUrl; - document.getElementById("pageInfo_TitleId").value = window.pageController.currentDocTitle; - window.chrome.flipFromCurrentView("PageInfoId"); - pageInfoShowing = true; - } - else { - window.chrome.flipToCurrentView("PageInfoId"); - pageInfoShowing = false; - } - } - - // Functions to instantiate views - - function showGoAnywhere() { - window.viewManager.showContent("goAnywhereView"); - window.viewManager.goAnywhereView.setPosition(40, 40); - window.viewManager.goAnywhereView.done.connect( - function() { - window.viewManager.showContent("webView"); - } - ); - } - - function showHistory() { - window.chrome.alert("handleLoadStart"); - window.viewManager.showContent("historyView"); - window.viewManager.historyView.setPosition(40, 40); - window.viewManager.historyView.done.connect( - function() { - window.viewManager.showContent("webView"); - } - ); - } - - // This function is for highlighting text in the go to entry - function selectAll(el) - { - el.select(); - } - - // Add an extra button in landscape mode - - function handleOrientation(orientation) { - if(orientation == "landscape"){ - document.getElementById("StarButtonId").style.display = "inline"; - } - else{ - document.getElementById("StarButtonId").style.display = "none"; - } - } - - window.chrome.onDisplayModeChanged.connect( - function(orientation){ - // handleOrientation(orientation); - } - ); - - // Functions to animate the load progress bar - - window.pageController.loadStarted.connect( - function() { - window.chrome.alert("handleLoadStart"); - document.getElementById("PBar").style.width = "0%"; - } - ); - - window.pageController.loadProgress.connect( - function(percent) { - var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - - window.pageController.loadFinished.connect( - function(ok) { - //window.chrome.alert("handleLoadFinished: " + ok); - //onChromeComplete(); - document.getElementById("PBar").style.width = "0%"; - } - ); - - // Update the url entry box with current url - - window.pageController.currentPageUrlChanged.connect( - function(url){ - document.getElementById("urlBox").value = url; - } - ); - - window.pageController.networkRequestError.connect( - function(reply) { - window.chrome.alert("networkRequestError: " + reply.error()); - } - ); - - window.pageController.titleChanged.connect( - function(title) { - // TBD - } - ); - - </script> - - <link rel="stylesheet" id = "CSSLink" type="text/css" href="css/chromeStyleBlack.css" /> - </head> - - <body onload="window.pageController.currentLoad('file:///C:/data/Others/chrome/demochrome/static.html');"> - <div class ="InitialChrome"> - <div class = "GinebraSnippet" id="TopChromeId" data-GinebraVisible="true" data-GinebraAnchor="AnchorTop"> - <form name = "gotoUrlForm"> - <span id="PBarWrapper" class="ProgressBarWrapper" style="width: 260px; position: absolute; top: 3px; left:4px; height:20px"> - <span id="PBar" class="ProgressBar" style="position:absolute; left: 1px; height: 18px;"> - </span> - <input type ="text" - class = "Text" - id = "urlBox" - name = "textBox" - style = "position: absolute; width: 260px; height: 18px" - value="http://www.google.com/webhp?hl=en&output=html" - onFocus="selectAll(this); return false;" - onMouseUp="return false;"/> - </span> - <span style="position: absolute; left: 270px; display: inline"> - <input type = "button" class="Button" value="Go" style="display: inline" - onclick=" window.pageController.currentLoad(document.gotoUrlForm.textBox.value)"/> - <input type = "button" class="Button" value="Min" style="display: inline" - onclick = "window.snippets.BottomChromeId.toggleVisibility()"/> - </span> - </form> - </div> - - <div class = "GinebraSnippet" id="BottomChromeId" name="BottomChrome" data-GinebraVisible="true" data-GinebraAnchor="AnchorBottom"> - <img id="backButton" src="images/backArrow.png" align="center" - style="width: 18px" class="ButtonImage" - onclick="window.pageController.actions.back.trigger()"/> - <img id="forwardButton" src="images/forwardArrow.png" align="center" - style="width: 18px" class="ButtonImage"/> - <img id="stopButton" src="images/stop.png" align="center" - style="width: 18px" class="ButtonImage"/> - <img id="reloadButton" src="images/reload.png" align="center" - style="width: 20px" class="ButtonImage"/> - <img src="./images/history.png" align="center" class="ButtonImage" onclick="showHistory()"/> - <img id="zoomInButton" src="images/zoomIn.png" align="center" - style="width: 20px" class="ButtonImage"/> - <img id="zoomOutButton" src="images/zoomOut.png" align="center" - style="width: 20px" class="ButtonImage"/> - <img src="./images/info.png" align="center" style="width: 20px" class="ButtonImage" onclick="flipPageInfo()"/> - <img src="images/star.png" align="center" style="width: 20px" class="ButtonImage" onclick="showGoAnywhere()"/> - <img src="./images/wrench_icon.jpg" align="center" class="ButtonImage" onclick="window.snippets.SettingsChromeId.toggleVisibility()"/> - </div> - - <div class = "GinebraSnippet" id="PageInfoId"> - <div class = "PageInfoInner"> - <form> - Title: <input id="pageInfo_TitleId" type="text"></br> - URL: <input id="pageInfo_UrlId" type="text"></br> - Text Language: <input id="language" type="text"></br> - </form> - <div align="right" style="margin-right: 20px"> - <input type = "button" class="Button" value="OK" onclick="flipPageInfo()"/> - </div> - </div> - </div> - - - <div class = "GinebraSnippet" id="SettingsChromeId" data-GinebraAnchor="AnchorCenter"> - - <h3>Chrome settings</h3> - <hr/> - Chrome: - <br/> - Simple - <input type ="radio" - checked = "checked" - name = "ChromeSelection" - value="s60-chrome.html"/> - - <button type="button" class="Button" onclick="window.chrome.loadChrome('file:///C:/data/Others/chrome/' + chromeSelect());">Update</button> - - <br/> - Veggie - <input type ="radio" - name = "ChromeSelection" - value="s60-veggie-chrome.html"/> - <hr/> - Style: - <br/> - Simple - <input type ="radio" - name = "StyleSelection" - checked = "checked" - value="chromeStyleFlat.css"/> - <button type="button" class="Button" onclick="newStyle('css/' + styleSelect());">Update</button> - - <br/> - Curved - <input type ="radio" - name = "StyleSelection" - value="chromeStyleBlack.css"/> - <br/> - </div> - </body> -</html> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/s60-veggie-chrome.html --- a/ginebra/chrome/demochrome/s60-veggie-chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,184 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - - // Do any snippet initialization in a handler for the chrome.loadComplete signal. - // Note that chrome may not be fully initialized when the html <body onload> event - // is invoked, whereas chrome initialization is guaranteed to be complete when - // this signal is invoked. - - function onChromeComplete() { - window.chrome.setBackgroundColor(0xDD,0x66,0x33); - window.snippets.BottomChromeId.setVisibilityAnimator("G_VISIBILITY_FLYOUT_ANIMATOR"); - window.snippets.TopChromeId.setVisibilityAnimator("G_VISIBILITY_SLIDE_ANIMATOR"); - } - - window.chrome.loadComplete.connect( - function(){ - onChromeComplete(); - } - ); - - function newStyle(style){ - var styleLink = document.getElementById("CSSLink"); - styleLink.href = style; - window.snippets.SettingsChromeId.toggleVisibility(); - } - - function chromeSelect(){ - var p = document.getElementsByName("ChromeSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - - return p[i].value; - } - } - } - - function styleSelect() { - var p = document.getElementsByName("StyleSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - - function animatorSelect(){ - var p = document.getElementsByName("AnimatorSelection"); - for(i = 0; i < p.length; i++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - window.pageController.loadStarted.connect( - function() { - window.chrome.alert("handleLoadStart"); - document.getElementById("PBar").style.width = "0%"; - } - ); - - window.pageController.loadProgress.connect( - function(percent) { - var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - - window.pageController.loadFinished.connect( - function(ok) { - window.chrome.alert("handleLoadFinished: " + ok); - document.getElementById("PBar").style.width = "0%"; - } - ); - - window.pageController.networkRequestError.connect( - function(reply) { - window.chrome.alert("onNetworkRequestError: " + reply.error()); - } - ); - - window.pageController.titleChanged.connect( - function(title) { - // TBD - } - ); - - window.pageController.currentPageUrlChanged.connect( - function(url){ - document.getElementById("urlBox").value = url; - window.chrome.toggleAttention("Button6"); - } - ); - - </script> - - <link id="CSSLink" rel="stylesheet" type="text/css" href="css/chromeStyleTransparent.css" /> - - </head> - <body> - <div class ="InitialChrome"> - <div class = "GinebraSnippet" id="TopChromeId" data-GinebraVisible="true" data-GinebraAnchor="AnchorTop" data-GinebraHidesContent="true"> - <form name = "gotoUrlForm"> - <span style="width: 300px; height: 24px; position: absolute; left: 4px"> - <span id="PBarWrapper" class="ProgressBarWrapper" style="position: absolute; top: 3px; height:24px"> - <span id="PBar" class="ProgressBar" style="position:absolute; left: 1px; height: 20px;"> - </span> - <span> - <input type ="text" - class = "Text" - id = "urlBox" - name = "textBox" - style = "position: absolute; width: 300px; height: 18px" - value="http://news.google.com"/> - </span> - - <image src = "./images/carrot.gif" height="36px" width="36px" style = "top: -3px; position: relative; left: 280px;" onclick="loadToMainWindow(document.gotoUrlForm.textBox.value)"/> - - <image src = "./images/tomato.gif" height="36px" width="36px" - style = "top: -3px; position: relative; left: 280px;" onclick = "window.chrome.toggleVisibility('BottomChromeId');"/> - </span> - </span> - </form> - </div> - - <div class = "GinebraSnippet" id="BottomChromeId" data-GinebraVisible="true" data-GinebraAnchor="AnchorBottom" data-GinebraHidesContent="true"> - <img id="Button1" class="GinebraButtonSnippet" src="./images/lettuce.gif" height="36px" width="36px" style="position: relative; left:30px" onclick="window.pageController.currentBack()"/> - <img id="Button2" class="GinebraButtonSnippet" src="./images/onion.gif" height="36px" width="36px" style="position: relative; left:40px" onclick="window.pageController.currentForward()"/> - <img id="Button3" class="GinebraButtonSnippet" src="./images/corn.gif" height="36px" width="36px" style="position: relative; left:50px" onclick="window.pageController.currentStop()"/> - <img id="Button4" class="GinebraButtonSnippet" src="./images/cuke.gif" height="36px" width="36px" style="position: relative; left:60px" onclick="window.pageController.currentReload()"/> - <img id="Button5" class="GinebraButtonSnippet" src="./images/pepper.gif" height="36px" width="36px" style="position: relative; left:70px" onclick="window.snippets.SettingsChromeId.toggleVisibility()"> - </div> - </div> - - - <div class = "GinebraSnippet" id="SettingsChromeId" data-GinebraAnchor="AnchorCenter"> - <h3>Chrome settings</h3> - <hr/> - Chrome: - <br/> - Simple - <input type ="radio" - name = "ChromeSelection" - value="s60-chrome.html"/> - <button type="button" class="Button" onclick="window.chrome.loadChrome('file:///C:/data/Others/chrome/demochrome/' + chromeSelect());">Update</button> - <br/> - Veggie - <input type ="radio" - checked = "checked" - name = "ChromeSelection" - value="s60-veggie-chrome.html"/> - - <hr/> - Animations: - <br/> - Fadeout - <input type ="radio" - checked = "checked" - name = "AnimatorSelection" - value="G_VISIBILITY_FADE_ANIMATOR"/> - - - <button type="button" class="Button" onclick="window.snippets.BottomChromeId.setVisiblityAnimator(animatorSelect())">Update</button> - - - <br/> - Flyout - <input type ="radio" - checked = "checked" - name = "AnimatorSelection" - value="G_VISIBILITY_FLYOUT_ANIMATOR"/> - - <br/> - Malstrom - <input type ="radio" - name = "AnimatorSelection" - value="G_VISIBILITY_MALSTROM_ANIMATOR"/> - <hr/> - </div> - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/snippets/BottomSnippet.html --- a/ginebra/chrome/demochrome/snippets/BottomSnippet.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - - <head> - <link rel="stylesheet" id = "CSSLink" type="text/css" href="../css/chromeStyleBlack.css" /> - </head> - <script type="text/javascript"> - - var pageInfoShowing = false; - - function showPageInfo() { - if(!pageInfoShowing){ - window.parent.document.getElementById("pageInfo_UrlId").value = window.parent.pageController.currentDocUrl; - window.parent.document.getElementById("pageInfo_TitleId").value = window.parent.pageController.currentDocTitle; - window.parent.chrome.showPageInfo(); - pageInfoShowing = true; - } - else { - window.parent.chrome.hidePageInfo(); - pageInfoShowing = false; - } - } - - function showHistory() { - window.parent.viewManager.showContent("historyView"); - window.parent.viewManager.historyView.setPosition(40, 40); - window.parent.viewManager.historyView.done.connect( - function() { - window.parent.viewManager.showContent("webView"); - } - ); - } - </script> - - <body> - <span class="ButtonRow"> - <img src="../images/backArrow.png" align="center" style="width: 18px" class="ButtonImage" onclick="window.parent.pageController.currentBack()"/> - <img src="../images/forwardArrow.png" align="center" style="width: 18px" class="ButtonImage" onclick="window.parent.pageController.currentForward()"/> - <img src="../images/history.png" align="center" class="ButtonImage" onclick="showHistory()"/> - <img src="../images/stop.png" align="center" style="width: 18px" class="ButtonImage" onclick="window.parent.pageController.currentStop()"/> - <img src="../images/reload.png" align="center" style="width: 20px" class="ButtonImage" onclick="window.parent.pageController.currentReload()"/> - <img src="../images/zoomIn.png" align="center" style="width: 20px" class="ButtonImage" onclick="window.parent.webView.zoomIn()"/> - <img src="../images/zoomOut.png" align="center" style="width: 20px" class="ButtonImage" onclick="window.parent.webView.zoomOut()"/> - <img src="../images/info.png" align="center" style="width: 20px" class="ButtonImage" onclick="showPageInfo()"/> - <img src="../images/wrench_icon.jpg" align="center" class="ButtonImage" onclick="window.parent.chrome.popToggle('PopChromeId')"/> - <img src="../images/red_sox_logo.gif" align="center" class="ButtonImage" onclick="window.parent.chrome.loadChrome('chrome/boston-chrome.html');"/> - <img src="../images/star.png" id="StarButtonId" align="center" class="ButtonImage" style="display: none;"/> - </span> - </body> -</html> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/snippets/PageInfoSnippet.html --- a/ginebra/chrome/demochrome/snippets/PageInfoSnippet.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - - <head> - <link rel="stylesheet" id = "CSSLink" type="text/css" href="../css/chromeStyleBlack.css" /> - </head> - <body> - <div class = "PageInfoInner"> - <form> - Title: <input id="pageInfo_TitleId" type="text"><br/> - URL: <input id="pageInfo_UrlId" type="text"><br/> - Text Language: <input id="language" type="text"><br/> - </form> - <div align="right" style="margin-right: 20px"> - <input type = "button" class="Button" value="OK" onclick="window.chrome.hidePageInfo()"/> - </div> - </body> -</html> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/snippets/PopSnippet.html --- a/ginebra/chrome/demochrome/snippets/PopSnippet.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - - <head> - <link rel="stylesheet" id = "CSSLink" type="text/css" href="../css/chromeStyleBlack.css" /> - </head> - <script type="text/javascript"> - function chromeSelect(){ - var p = document.getElementsByName("ChromeSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - function styleSelect() { - var p = document.getElementsByName("StyleSelection"); - for(i = 0; i < p.length; i ++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - </script> - <body> - <h3>Chrome settings</h3> - <hr/> - Chrome: - <br/> - Simple - <input type ="radio" - checked = "checked" - name = "ChromeSelection" - value="chrome.html"/> - - <button type="button" class="Button" onclick="window.chrome.updateChrome('chrome/' + chromeSelect());">Update</button> - - <br/> - Veggie - <input type ="radio" - name = "ChromeSelection" - value="veggie-chrome.html"/> - <hr/> - Style: - <br/> - Simple - <input type ="radio" - checked = "checked" - name = "StyleSelection" - value="chromeStyleFlat.css"/> - <button type="button" class="Button" onclick="newStyle('css/' + styleSelect());">Update</button> - - <br/> - Curved - <input type ="radio" - name = "StyleSelection" - value="chromeStyleBlack.css"/> - <br/> - </body> -</html> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/snippets/TopSnippet.html --- a/ginebra/chrome/demochrome/snippets/TopSnippet.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - - <head> - <link rel="stylesheet" id = "CSSLink" type="text/css" href="../css/chromeStyleBlack.css" /> - </head> - <script type="text/javascript"> - - function loadToMainWindow(url){ - window.parent.pageController.currentLoad(url); - } - window.parent.pageController.loadStarted.connect( - function() { - document.getElementById("PBar").style.width = "0%"; - } - ); - window.parent.pageController.loadProgress.connect( - function(percent) { - var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - window.parent.pageController.loadFinished.connect( - function(ok) { - document.getElementById("PBar").style.width = "0%"; - } - ); - </script> - <body> - <form name = "gotoUrlForm"> - <span id="PBarWrapper" class="ProgressBarWrapper" style="width: 260px; position: absolute; top: 3px; left:4px; height:20px"> - <span id="PBar" class="ProgressBar" style="position:absolute; left: 1px; height: 18px;"> - </span> - <input type ="text" - class = "Text" - id = "urlBox" - name = "textBox" - style = "position: absolute; width: 260px; height: 18px" - value="http://www.google.com/webhp?hl=en&output=html"/> - </span> - <span style="position: absolute; left: 270px; display: inline"> - <input type = "button" class="Button" value="Go" style="display: inline" - onclick="loadToMainWindow(document.gotoUrlForm.textBox.value)"/> - <input type = "button" class="Button" value="Min" style="display: inline" - onclick = "window.parent.chrome.topToggle();window.parent.chrome.bottomToggle()"/> - </span> - </form> - </body> -</html> diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/static.html --- a/ginebra/chrome/demochrome/static.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -<html> -<head> -</head> -<body bgcolor="white"> -<h2>Ginebra</h2> -Static test page. -<ul> -<li><a href = "http://www.google.com">Google</a></li> -<li><a href = "http://connecting.nokia.com">Connecting Nokia Home Page</a></li> -</ul> -</body> -</html> \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/demochrome/veggie-chrome.html --- a/ginebra/chrome/demochrome/veggie-chrome.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - function loadToMainWindow(url){ - // alert("Loading:" + url); - window.pageController.currentLoad(url); - } - - - function newStyle(style){ - var styleLink = document.getElementById("CSSLink"); - styleLink.href = style; - } - - - var settingsPopUp = false; - - function toggleSettings() - { - if(settingsPopUp){ - window.chrome.toggleVisibility("SettingsChromeId"); - } - else { - window.chrome.show("SettingsChromeId", 10, 120); - settingsPopUp = true; - } - } - - - var pageInfoShowing = false; - - function showPageInfo() { - //window.chrome.setBackgroundColor(255,255,255); - //alert("showPageInfo"); - if(!pageInfoShowing){ - document.getElementById("pageInfo_UrlId").value = window.pageController.currentDocUrl; - document.getElementById("pageInfo_TitleId").value = window.pageController.currentDocTitle; - window.chrome.showPageInfo(); - pageInfoShowing = true; - } - else { - window.chrome.hidePageInfo(); - pageInfoShowing = false; - } - } - - function chromeSelect(){ - var p = document.getElementsByName("ChromeSelection"); - for(i = 0; i < p.length; i++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - function animatorSelect(){ - var p = document.getElementsByName("AnimatorSelection"); - for(i = 0; i < p.length; i++){ - if(p[i].checked == true){ - return p[i].value; - } - } - } - - - function onLoad(){ - window.chrome.setBackgroundColor(0xDD,0x66,0x33); - window.chrome.setAnchor("TopChromeId", "AnchorTop"); - window.chrome.setAnchor("BottomChromeId", "AnchorBottom"); - window.chrome.setVisibilityAnimator("BottomChromeId", "G_VISIBILITY_FLYOUT_ANIMATOR"); - window.chrome.setAttentionAnimator("Button6", "G_ATTENTION_BOUNCE_ANIMATOR"); - } - - window.pageController.loadStarted.connect( - function() { - window.chrome.alert("handleLoadStart"); - document.getElementById("PBar").style.width = "0%"; - } - ); - window.pageController.loadProgress.connect( - function(percent) { - var parentWidth = document.getElementById("PBarWrapper").offsetWidth; - document.getElementById("PBar").style.width = (parentWidth * percent)/100 + "px"; - } - ); - window.pageController.loadFinished.connect( - function(ok) { - window.chrome.alert("handleLoadFinished: " + ok); - document.getElementById("PBar").style.width = "0%"; - } - ); - window.pageController.networkRequestError.connect( - function(reply) { - window.chrome.alert("onNetworkRequestError: " + reply.error()); - } - ); - window.pageController.titleChanged.connect( - function(title) { - // TBD - } - ); - window.pageController.currentPageUrlChanged.connect( - function(url){ - document.getElementById("urlBox").value = url; - window.chrome.toggleAttention("Button6"); - } - ); - - </script> - - <link id="CSSLink" rel="stylesheet" type="text/css" href="css/chromeStyleTransparent.css" /> - - </head> - <body onload="onLoad();"> - <div class ="InitialChrome"> - <div class = "TopChrome" id="TopChromeId"> - <form name = "gotoUrlForm"> - <span style="width: 300px; height: 24px; position: absolute; left: 4px"> - <span id="PBarWrapper" class="ProgressBarWrapper" style="position: absolute; top: 3px; height:24px"> - <span id="PBar" class="ProgressBar" style="position:absolute; left: 1px; height: 20px;"> - </span> - <span> - <input type ="text" - class = "Text" - id = "urlBox" - name = "textBox" - style = "position: absolute; width: 300px; height: 18px" - value="http://news.google.com"/> - </span> - - <image src = "./images/carrot.png" height="36px" width="36px" style = "top: -3px; position: relative; left: 280px;" onclick="loadToMainWindow(document.gotoUrlForm.textBox.value)"/> - - <image src = "./images/tomato.png" height="36px" width="36px" - style = "top: -3px; position: relative; left: 280px;" onclick = "window.chrome.toggleVisibility('BottomChromeId');"/> - </span> - </span> - </form> - </div> - - <div class = "BottomChrome" id="BottomChromeId"> - <img id="Button1" name="ChromeRowButton" src="./images/lettuce.png" height="36px" width="36px" style="position: relative; left:30px" onclick="window.pageController.currentBack()"/> - <img id="Button2" name="ChromeRowButton" src="./images/onion.png" height="36px" width="36px" style="position: relative; left:40px" onclick="window.pageController.currentForward()"/> - <img id="Button3" name="ChromeRowButton" src="./images/corn.png" height="36px" width="36px" style="position: relative; left:50px" onclick="window.pageController.currentStop()"/> - <img id="Button4" name="ChromeRowButton" src="./images/cuke.png" height="36px" width="36px" style="position: relative; left:60px" onclick="window.pageController.currentReload()"/> - <img id="Button5" name="ChromeRowButton" src="./images/pepper.png" height="36px" width="36px" style="position: relative; left:70px" onclick="toggleSettings()"> - <img id="Button6" name="ChromeRowButton" src="./images/tomato.png" height="36px" width="36px" style="position: relative; left:80px" onclick="showPageInfo()"/> - </div> - </div> - - - <div class = "PageInfo" id="PageInfoId"> - <form> - Title: <input id="pageInfo_TitleId" type="text"></br> - URL: <input id="pageInfo_UrlId" type="text"></br> - Text Language: <input id="language" type="text"></br> - </form> - <input type = "button" class="Button" value="OK" onclick="window.chrome.hidePageInfo()"/> - </div> - - - <div class = "PopChrome" id="SettingsChromeId"> - <h3>Chrome settings</h3> - <hr/> - Chrome: - <br/> - Simple - <input type ="radio" - name = "ChromeSelection" - value="chrome.html"/> - <button type="button" class="Button" onclick="window.chrome.loadChrome('chrome/' + chromeSelect());">Update</button> - <br/> - Veggie - <input type ="radio" - checked = "checked" - name = "ChromeSelection" - value="veggie-chrome.html"/> - - <hr/> - Animations: - <br/> - Fadeout - <input type ="radio" - checked = "checked" - name = "AnimatorSelection" - value="G_VISIBILITY_FADE_ANIMATOR"/> - - - <button type="button" class="Button" onclick="window.chrome.setVisibilityAnimator('BottomChromeId', animatorSelect());toggleSettings()">Update</button> - - - <br/> - Flyout - <input type ="radio" - checked = "checked" - name = "AnimatorSelection" - value="G_VISIBILITY_FLYOUT_ANIMATOR"/> - - <br/> - Malstrom - <input type ="radio" - name = "AnimatorSelection" - value="G_VISIBILITY_MALSTROM_ANIMATOR"/> - <hr/> - - - </div> - <div class = "PopChrome" id="PopChromeId2"> - Other pop chrome content - </div> - - </body> -</html> - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/3rdparty/SlowlyFade-0.88.js --- a/ginebra/chrome/js/3rdparty/SlowlyFade-0.88.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -// @name Slowly Fade -// @version 0.88 -// @author Richard D. LeCour -// @namespace http://www.richardsramblings.com/?p=486 - -var opacity = 96; // Avoid starting at 100% due to Mozilla bug -var slowly = { - fade : function (id) { - opacity = 96; - this.fadeLoop(id, opacity); - }, - fadeLoop : function (id, opacity) { - var o = document.getElementById(id); - if (opacity >= 5) { - slowly.setOpacity(o, opacity); - opacity -= 4; - window.setTimeout("slowly.fadeLoop('" + id + "', " + opacity + ")", 50); - } else { - o.style.display = "none"; - } - }, - setOpacity : function (o, opacity) { - o.style.filter = "alpha(style=0,opacity:" + opacity + ")"; // IE - o.style.KHTMLOpacity = opacity / 100; // Konqueror - o.style.MozOpacity = opacity / 100; // Mozilla (old) - o.style.opacity = opacity / 100; // Mozilla (new) - }, - - show : function (id) { - opacity = 4; - this.showLoop(id, opacity); - }, - showLoop : function (id, opacity) { - //alert('opacity: ' + opacity); - var o = document.getElementById(id); - if (opacity <= 100) { - - slowly.setOpacity(o, opacity); - opacity += 4; - window.setTimeout("slowly.showLoop('" + id + "', " + opacity + ")", 50); - } - } -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/3rdparty/jquery-1.3.1.min.js --- a/ginebra/chrome/js/3rdparty/jquery-1.3.1.min.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -/* - * jQuery JavaScript Library v1.3.1 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-01-21 20:42:16 -0500 (Wed, 21 Jan 2009) - * Revision: 6158 - */ -(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.makeArray(E))},selector:"",jquery:"1.3.1",size:function(){return this.length},get:function(E){return E===g?o.makeArray(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,find:function(E){if(this.length===1&&!/,/.test(E)){var G=this.pushStack([],"find",E);G.length=0;o.find(E,this[0],G);return G}else{var F=o.map(this,function(H){return o.find(E,H)});return this.pushStack(/[^+>] [^+>]/.test(E)?o.unique(F):F,"find",E)}},clone:function(F){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.cloneNode(true),H=document.createElement("div");H.appendChild(I);return o.clean([H.innerHTML])[0]}else{return this.cloneNode(true)}});var G=E.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(F===true){this.find("*").andSelf().each(function(I){if(this.nodeType==3){return}var H=o.data(this,"events");for(var K in H){for(var J in H[K]){o.event.add(G[I],K,H[K][J],H[K][J].data)}}})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var F=o.expr.match.POS.test(E)?o(E):null;return this.map(function(){var G=this;while(G&&G.ownerDocument){if(F?F.index(G)>-1:o(G).is(E)){return G}G=G.parentNode}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML:null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(K,N,M){if(this[0]){var J=(this[0].ownerDocument||this[0]).createDocumentFragment(),G=o.clean(K,(this[0].ownerDocument||this[0]),J),I=J.firstChild,E=this.length>1?J.cloneNode(true):J;if(I){for(var H=0,F=this.length;H<F;H++){M.call(L(this[H],I),H>0?E.cloneNode(true):J)}}if(G){o.each(G,z)}}return this;function L(O,P){return N&&o.nodeName(O,"table")&&o.nodeName(P,"tr")?(O.getElementsByTagName("tbody")[0]||O.appendChild(O.ownerDocument.createElement("tbody"))):O}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){G=o.trim(G);if(G){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(G,E,I){if(E=="width"||E=="height"){var K,F={position:"absolute",visibility:"hidden",display:"block"},J=E=="width"?["Left","Right"]:["Top","Bottom"];function H(){K=E=="width"?G.offsetWidth:G.offsetHeight;var M=0,L=0;o.each(J,function(){M+=parseFloat(o.curCSS(G,"padding"+this,true))||0;L+=parseFloat(o.curCSS(G,"border"+this+"Width",true))||0});K-=Math.round(M+L)}if(o(G).is(":visible")){H()}else{o.swap(G,F,H)}return Math.max(0,K)}return o.curCSS(G,E,I)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,R){if(typeof R==="number"){R+=""}if(!R){return}if(typeof R==="string"){R=R.replace(/(<(\w+)[^>]*?)\/>/g,function(T,U,S){return S.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?T:U+"></"+S+">"});var O=o.trim(R).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+R+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var N=!O.indexOf("<table")&&O.indexOf("<tbody")<0?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&O.indexOf("<tbody")<0?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(R)){L.insertBefore(K.createTextNode(R.match(/^\s*/)[0]),L.firstChild)}R=o.makeArray(L.childNodes)}if(R.nodeType){G.push(R)}else{G=o.merge(G,R)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha$[^)]*$/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(){var G=arguments;return this.each(function(){for(var H=0,I=G.length;H<I;H++){o(G[H])[F](this)}})}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(">*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var Q=/((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,K=0,G=Object.prototype.toString;var F=function(X,T,aa,ab){aa=aa||[];T=T||document;if(T.nodeType!==1&&T.nodeType!==9){return[]}if(!X||typeof X!=="string"){return aa}var Y=[],V,ae,ah,S,ac,U,W=true;Q.lastIndex=0;while((V=Q.exec(X))!==null){Y.push(V[1]);if(V[2]){U=RegExp.rightContext;break}}if(Y.length>1&&L.exec(X)){if(Y.length===2&&H.relative[Y[0]]){ae=I(Y[0]+Y[1],T)}else{ae=H.relative[Y[0]]?[T]:F(Y.shift(),T);while(Y.length){X=Y.shift();if(H.relative[X]){X+=Y.shift()}ae=I(X,ae)}}}else{var ad=ab?{expr:Y.pop(),set:E(ab)}:F.find(Y.pop(),Y.length===1&&T.parentNode?T.parentNode:T,P(T));ae=F.filter(ad.expr,ad.set);if(Y.length>0){ah=E(ae)}else{W=false}while(Y.length){var ag=Y.pop(),af=ag;if(!H.relative[ag]){ag=""}else{af=Y.pop()}if(af==null){af=T}H.relative[ag](ah,af,P(T))}}if(!ah){ah=ae}if(!ah){throw"Syntax error, unrecognized expression: "+(ag||X)}if(G.call(ah)==="[object Array]"){if(!W){aa.push.apply(aa,ah)}else{if(T.nodeType===1){for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&(ah[Z]===true||ah[Z].nodeType===1&&J(T,ah[Z]))){aa.push(ae[Z])}}}else{for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&ah[Z].nodeType===1){aa.push(ae[Z])}}}}}else{E(ah,aa)}if(U){F(U,T,aa,ab)}return aa};F.matches=function(S,T){return F(S,null,null,T)};F.find=function(Z,S,aa){var Y,W;if(!Z){return[]}for(var V=0,U=H.order.length;V<U;V++){var X=H.order[V],W;if((W=H.match[X].exec(Z))){var T=RegExp.leftContext;if(T.substr(T.length-1)!=="\\"){W[1]=(W[1]||"").replace(/\\/g,"");Y=H.find[X](W,S,aa);if(Y!=null){Z=Z.replace(H.match[X],"");break}}}}if(!Y){Y=S.getElementsByTagName("*")}return{set:Y,expr:Z}};F.filter=function(ab,aa,ae,V){var U=ab,ag=[],Y=aa,X,S;while(ab&&aa.length){for(var Z in H.filter){if((X=H.match[Z].exec(ab))!=null){var T=H.filter[Z],af,ad;S=false;if(Y==ag){ag=[]}if(H.preFilter[Z]){X=H.preFilter[Z](X,Y,ae,ag,V);if(!X){S=af=true}else{if(X===true){continue}}}if(X){for(var W=0;(ad=Y[W])!=null;W++){if(ad){af=T(ad,X,W,Y);var ac=V^!!af;if(ae&&af!=null){if(ac){S=true}else{Y[W]=false}}else{if(ac){ag.push(ad);S=true}}}}}if(af!==g){if(!ae){Y=ag}ab=ab.replace(H.match[Z],"");if(!S){return[]}break}}}ab=ab.replace(/\s*,\s*/,"");if(ab==U){if(S==null){throw"Syntax error, unrecognized expression: "+ab}else{break}}U=ab}return Y};var H=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:$(even|odd|[\dn+-]*)$)?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:$(['"]*)((?:\([^$]+\)|[^\2]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(S){return S.getAttribute("href")}},relative:{"+":function(W,T){for(var U=0,S=W.length;U<S;U++){var V=W[U];if(V){var X=V.previousSibling;while(X&&X.nodeType!==1){X=X.previousSibling}W[U]=typeof T==="string"?X||false:X===T}}if(typeof T==="string"){F.filter(T,W,true)}},">":function(X,T,Y){if(typeof T==="string"&&!/\W/.test(T)){T=Y?T:T.toUpperCase();for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){var V=W.parentNode;X[U]=V.nodeName===T?V:false}}}else{for(var U=0,S=X.length;U<S;U++){var W=X[U];if(W){X[U]=typeof T==="string"?W.parentNode:W.parentNode===T}}if(typeof T==="string"){F.filter(T,X,true)}}},"":function(V,T,X){var U="done"+(K++),S=R;if(!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("parentNode",T,U,V,W,X)},"~":function(V,T,X){var U="done"+(K++),S=R;if(typeof T==="string"&&!T.match(/\W/)){var W=T=X?T:T.toUpperCase();S=O}S("previousSibling",T,U,V,W,X)}},find:{ID:function(T,U,V){if(typeof U.getElementById!=="undefined"&&!V){var S=U.getElementById(T[1]);return S?[S]:[]}},NAME:function(S,T,U){if(typeof T.getElementsByName!=="undefined"&&!U){return T.getElementsByName(S[1])}},TAG:function(S,T){return T.getElementsByTagName(S[1])}},preFilter:{CLASS:function(V,T,U,S,Y){V=" "+V[1].replace(/\\/g,"")+" ";var X;for(var W=0;(X=T[W])!=null;W++){if(X){if(Y^(" "+X.className+" ").indexOf(V)>=0){if(!U){S.push(X)}}else{if(U){T[W]=false}}}}return false},ID:function(S){return S[1].replace(/\\/g,"")},TAG:function(T,S){for(var U=0;S[U]===false;U++){}return S[U]&&P(S[U])?T[1]:T[1].toUpperCase()},CHILD:function(S){if(S[1]=="nth"){var T=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(S[2]=="even"&&"2n"||S[2]=="odd"&&"2n+1"||!/\D/.test(S[2])&&"0n+"+S[2]||S[2]);S[2]=(T[1]+(T[2]||1))-0;S[3]=T[3]-0}S[0]="done"+(K++);return S},ATTR:function(T){var S=T[1].replace(/\\/g,"");if(H.attrMap[S]){T[1]=H.attrMap[S]}if(T[2]==="~="){T[4]=" "+T[4]+" "}return T},PSEUDO:function(W,T,U,S,X){if(W[1]==="not"){if(W[3].match(Q).length>1){W[3]=F(W[3],null,null,T)}else{var V=F.filter(W[3],T,U,true^X);if(!U){S.push.apply(S,V)}return false}}else{if(H.match.POS.test(W[0])){return true}}return W},POS:function(S){S.unshift(true);return S}},filters:{enabled:function(S){return S.disabled===false&&S.type!=="hidden"},disabled:function(S){return S.disabled===true},checked:function(S){return S.checked===true},selected:function(S){S.parentNode.selectedIndex;return S.selected===true},parent:function(S){return !!S.firstChild},empty:function(S){return !S.firstChild},has:function(U,T,S){return !!F(S[3],U).length},header:function(S){return/h\d/i.test(S.nodeName)},text:function(S){return"text"===S.type},radio:function(S){return"radio"===S.type},checkbox:function(S){return"checkbox"===S.type},file:function(S){return"file"===S.type},password:function(S){return"password"===S.type},submit:function(S){return"submit"===S.type},image:function(S){return"image"===S.type},reset:function(S){return"reset"===S.type},button:function(S){return"button"===S.type||S.nodeName.toUpperCase()==="BUTTON"},input:function(S){return/input|select|textarea|button/i.test(S.nodeName)}},setFilters:{first:function(T,S){return S===0},last:function(U,T,S,V){return T===V.length-1},even:function(T,S){return S%2===0},odd:function(T,S){return S%2===1},lt:function(U,T,S){return T<S[3]-0},gt:function(U,T,S){return T>S[3]-0},nth:function(U,T,S){return S[3]-0==T},eq:function(U,T,S){return S[3]-0==T}},filter:{CHILD:function(S,V){var Y=V[1],Z=S.parentNode;var X=V[0];if(Z&&(!Z[X]||!S.nodeIndex)){var W=1;for(var T=Z.firstChild;T;T=T.nextSibling){if(T.nodeType==1){T.nodeIndex=W++}}Z[X]=W-1}if(Y=="first"){return S.nodeIndex==1}else{if(Y=="last"){return S.nodeIndex==Z[X]}else{if(Y=="only"){return Z[X]==1}else{if(Y=="nth"){var ab=false,U=V[2],aa=V[3];if(U==1&&aa==0){return true}if(U==0){if(S.nodeIndex==aa){ab=true}}else{if((S.nodeIndex-aa)%U==0&&(S.nodeIndex-aa)/U>=0){ab=true}}return ab}}}}},PSEUDO:function(Y,U,V,Z){var T=U[1],W=H.filters[T];if(W){return W(Y,V,U,Z)}else{if(T==="contains"){return(Y.textContent||Y.innerText||"").indexOf(U[3])>=0}else{if(T==="not"){var X=U[3];for(var V=0,S=X.length;V<S;V++){if(X[V]===Y){return false}}return true}}}},ID:function(T,S){return T.nodeType===1&&T.getAttribute("id")===S},TAG:function(T,S){return(S==="*"&&T.nodeType===1)||T.nodeName===S},CLASS:function(T,S){return S.test(T.className)},ATTR:function(W,U){var S=H.attrHandle[U[1]]?H.attrHandle[U[1]](W):W[U[1]]||W.getAttribute(U[1]),X=S+"",V=U[2],T=U[4];return S==null?V==="!=":V==="="?X===T:V==="*="?X.indexOf(T)>=0:V==="~="?(" "+X+" ").indexOf(T)>=0:!U[4]?S:V==="!="?X!=T:V==="^="?X.indexOf(T)===0:V==="$="?X.substr(X.length-T.length)===T:V==="|="?X===T||X.substr(0,T.length+1)===T+"-":false},POS:function(W,T,U,X){var S=T[2],V=H.setFilters[S];if(V){return V(W,U,T,X)}}}};var L=H.match.POS;for(var N in H.match){H.match[N]=RegExp(H.match[N].source+/(?![^\[]*\])(?![^$]*$)/.source)}var E=function(T,S){T=Array.prototype.slice.call(T);if(S){S.push.apply(S,T);return S}return T};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(M){E=function(W,V){var T=V||[];if(G.call(W)==="[object Array]"){Array.prototype.push.apply(T,W)}else{if(typeof W.length==="number"){for(var U=0,S=W.length;U<S;U++){T.push(W[U])}}else{for(var U=0;W[U];U++){T.push(W[U])}}}return T}}(function(){var T=document.createElement("form"),U="script"+(new Date).getTime();T.innerHTML="<input name='"+U+"'/>";var S=document.documentElement;S.insertBefore(T,S.firstChild);if(!!document.getElementById(U)){H.find.ID=function(W,X,Y){if(typeof X.getElementById!=="undefined"&&!Y){var V=X.getElementById(W[1]);return V?V.id===W[1]||typeof V.getAttributeNode!=="undefined"&&V.getAttributeNode("id").nodeValue===W[1]?[V]:g:[]}};H.filter.ID=function(X,V){var W=typeof X.getAttributeNode!=="undefined"&&X.getAttributeNode("id");return X.nodeType===1&&W&&W.nodeValue===V}}S.removeChild(T)})();(function(){var S=document.createElement("div");S.appendChild(document.createComment(""));if(S.getElementsByTagName("*").length>0){H.find.TAG=function(T,X){var W=X.getElementsByTagName(T[1]);if(T[1]==="*"){var V=[];for(var U=0;W[U];U++){if(W[U].nodeType===1){V.push(W[U])}}W=V}return W}}S.innerHTML="<a href='#'></a>";if(S.firstChild&&S.firstChild.getAttribute("href")!=="#"){H.attrHandle.href=function(T){return T.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var S=F,T=document.createElement("div");T.innerHTML="<p class='TEST'></p>";if(T.querySelectorAll&&T.querySelectorAll(".TEST").length===0){return}F=function(X,W,U,V){W=W||document;if(!V&&W.nodeType===9&&!P(W)){try{return E(W.querySelectorAll(X),U)}catch(Y){}}return S(X,W,U,V)};F.find=S.find;F.filter=S.filter;F.selectors=S.selectors;F.matches=S.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){H.order.splice(1,0,"CLASS");H.find.CLASS=function(S,T){return T.getElementsByClassName(S[1])}}function O(T,Z,Y,ac,aa,ab){for(var W=0,U=ac.length;W<U;W++){var S=ac[W];if(S){S=S[T];var X=false;while(S&&S.nodeType){var V=S[Y];if(V){X=ac[V];break}if(S.nodeType===1&&!ab){S[Y]=W}if(S.nodeName===Z){X=S;break}S=S[T]}ac[W]=X}}}function R(T,Y,X,ab,Z,aa){for(var V=0,U=ab.length;V<U;V++){var S=ab[V];if(S){S=S[T];var W=false;while(S&&S.nodeType){if(S[X]){W=ab[S[X]];break}if(S.nodeType===1){if(!aa){S[X]=V}if(typeof Y!=="string"){if(S===Y){W=true;break}}else{if(F.filter(Y,[S]).length>0){W=S;break}}}S=S[T]}ab[V]=W}}}var J=document.compareDocumentPosition?function(T,S){return T.compareDocumentPosition(S)&16}:function(T,S){return T!==S&&(T.contains?T.contains(S):true)};var P=function(S){return S.nodeType===9&&S.documentElement.nodeName!=="HTML"||!!S.ownerDocument&&P(S.ownerDocument)};var I=function(S,Z){var V=[],W="",X,U=Z.nodeType?[Z]:Z;while((X=H.match.PSEUDO.exec(S))){W+=X[0];S=S.replace(H.match.PSEUDO,"")}S=H.relative[S]?S+"*":S;for(var Y=0,T=U.length;Y<T;Y++){F(S,U[Y],V)}return F.filter(W,V)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(S){return"hidden"===S.type||o.css(S,"display")==="none"||o.css(S,"visibility")==="hidden"};F.selectors.filters.visible=function(S){return"hidden"!==S.type&&o.css(S,"display")!=="none"&&o.css(S,"visibility")!=="hidden"};F.selectors.filters.animated=function(S){return o.grep(o.timers,function(T){return S===T.elem}).length};o.multiFilter=function(U,S,T){if(T){U=":not("+U+")"}return F.matches(U,S)};o.dir=function(U,T){var S=[],V=U[T];while(V&&V!=document){if(V.nodeType==1){S.push(V)}V=V[T]}return S};o.nth=function(W,S,U,V){S=S||1;var T=0;for(;W;W=W[U]){if(W.nodeType==1&&++T==S){break}}return W};o.sibling=function(U,T){var S=[];for(;U;U=U.nextSibling){if(U.nodeType==1&&U!=T){S.push(U)}}return S};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){G=false}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&typeof l.frameElement==="undefined"){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML=' <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width="1px";L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L)})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}this[H].style.display=o.data(this[H],"olddisplay",K)}}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)==1){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n)}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(H,F){var E=H?"Left":"Top",G=H?"Right":"Bottom";o.fn["inner"+F]=function(){return this[F.toLowerCase()]()+j(this,"padding"+E)+j(this,"padding"+G)};o.fn["outer"+F]=function(J){return this["inner"+F]()+j(this,"border"+E+"Width")+j(this,"border"+G+"Width")+(J?j(this,"margin"+E)+j(this,"margin"+G):0)};var I=F.toLowerCase();o.fn[I]=function(J){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+F]||document.body["client"+F]:this[0]==document?Math.max(document.documentElement["client"+F],document.body["scroll"+F],document.documentElement["scroll"+F],document.body["offset"+F],document.documentElement["offset"+F]):J===g?(this.length?o.css(this[0],I):null):this.css(I,typeof J==="string"?J:J+"px")}})})(); \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/ActionButton.js --- a/ginebra/chrome/js/ActionButton.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -// Call ActionButton to wire an HTML button (typically an <img> tag) to an action (QAction). -// Params: -// id - the id of the button. Ex: <img id="buttonId" .../> -// upImg - the path to the "up" image for the button. -// downImg - the path to the "down" image for the button. Note: not yet working... -// disabledImg - the path to the "disabled" image for the button. -// action - the targeted action -// -function ActionButton(id, upImg, downImg, disabledImg, action) { - this.id = id; - this.upImg = upImg; - this.downImg = downImg; - this.disabledImg = disabledImg; - this.action = action; - this.isDown = false; - - //window.chrome.alert("ActionButton"); - - // attach this object to the item as "button" for later access - // delete/cleanup existing button (if any) and attach this as button - dom = document.getElementById(this.id); - if(dom.button) { - delete dom.button; - } - dom.button = this; - - this.element = function() { - return document.getElementById(this.id); - } - - this.updateButton = function() { - //window.chrome.alert("ActionButton::updateButton " + this); - if(this.action.enabled) { - if(this.isDown) { - this.element().src = this.downImg; - } - else { - this.element().src = this.upImg; - } - } - else { - this.element().src = this.disabledImg; - } - } - - // Make sure we can find the element. - if(!this.element()) { - alert("ActionButton: element not found, " + id); - return; - } - - // -------------------------------- - - // Callback for changes in the action's state. - onActionChanged = function() { -// window.chrome.alert("ActionButton::on action changed " + -// " this=" + this + -// " action=" + this.action + -// " id=" + this.id + -// " enabled=" + this.action.enabled + -// " src=" + this.element().src); - this.updateButton(); - } - -// Commented out because onclick is not reliable. Slight movements between mouse down -// and mouse up seem to cancel the onclick. -// this.onClick = function() { -// window.chrome.alert("ActionButton::onClick: " + this); -// if(this.action.enabled) { -// this.action.trigger(); -// } -// else { -// window.chrome.alert("ActionButton::onClick: not enabled"); -// } -// } - - this.onMouseDown = function() { - //window.chrome.alert("ActionButton::onMouseDown " + this); - if(!this.isDown) { - this.isDown = true; - this.updateButton.call(this); - if((this.id == 'zoomBarBtnIn') || (this.id == 'zoomBarBtnOut') || (this.id == 'zoomIn') || (this.id == 'zoomOut')) - this.action.trigger(); - } - } - - this.onMouseUp = function() { - //window.chrome.alert("ActionButton::onMouseUp " + this); - if(this.isDown) { - this.isDown = false; - this.updateButton.call(this); - - // Trigger the action. - this.action.trigger(); - } - } - - this.onMouseOut = function() { - //window.chrome.alert("ActionButton::onMouseOut " + this); - if (this.isDown ) { - this.isDown = false; - this.updateButton.call(this); - - if((this.id == 'zoomBarBtnIn') || (this.id == 'zoomBarBtnOut') || (this.id == 'zoomIn') || (this.id == 'zoomOut')) - this.action.trigger(); - } - } - - - // Connect to the action's "changed" signal. Note: don't use bind here, causes crash in - // scope chain code (but only for first document that is loaded...). - this.action.changed.connect(createDelegate(this, onActionChanged)); - - // Set up element event handlers. - this.element().onmousedown = this.onMouseDown.bind(this); - this.element().onmouseup = this.onMouseUp.bind(this); - this.element().onmouseout = this.onMouseOut.bind(this); -// this.element().onclick = this.onClick.bind(this); - - // Set the initial state of the button. - this.updateButton(); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/Bind.js --- a/ginebra/chrome/js/Bind.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - -Function.prototype.bind = function(obj) { - var method = this, - temp = function() { - return method.apply(obj, arguments); - }; - - return temp; -} - -function createDelegate(object, method) { - var shim = function() - { - method.apply(object, arguments); - } - - return shim; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/ContextMenu.js --- a/ginebra/chrome/js/ContextMenu.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - - -$(document).ready(function() { - - //Get all the LI from the #tabMenu UL - $('#tabMenu > li').click(function(){ - - //perform the actions when it's not selected - if (!$(this).hasClass('selected')) { - - //remove the selected class from all LI - $('#tabMenu > li').removeClass('selected'); - - //Reassign the LI - $(this).addClass('selected'); - - //Hide all the DIV in .boxBody - $('.boxBody div').slideUp('1500'); - - //Look for the right DIV in boxBody according to the Navigation UL index, therefore, the arrangement is very important. - $('.boxBody div:eq(' + $('#tabMenu > li').index(this) + ')').slideDown('1500'); - } - - }).mouseover(function() { - //Add and remove class, Personally I dont think this is the right way to do it, anyone please suggest - $(this).addClass('mouseover'); - $(this).removeClass('mouseout'); - - }).mouseout(function() { - - //Add and remove class - $(this).addClass('mouseout'); - $(this).removeClass('mouseover'); - - }); - - //Mouseover effect for menu list. - $('.boxBody li').click(function(){ - window.snippets.ContextMenuId.hide(); - }).mouseover(function() { - $(this).css('backgroundColor','#222'); - $(this).css('color','#fff'); - }).mouseout(function() { - $(this).css('backgroundColor',''); - $(this).css('color',''); - }); - -}); - \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/LongPress.js --- a/ginebra/chrome/js/LongPress.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -// -// Use LongPress() to set a function callback for a long-press on a particular DOM element. -// Example: -// <javascript ...> -// new LongPress("btnId", function() { alert("hello"); }); -// </javascript> -// ... -// <img id="btnId" ... /> -// -function LongPress(elementId, callback) { - this.el = document.getElementById(elementId); - this.callback = callback; - this.initialX = 0; - this.initialY = 0; - - if(!this.el) { - window.chrome.alert("LongPress: element " + elementId + " not found"); - return; - } - - this.onTimerFired = function() { - window.chrome.alert("onTimerFired"); - this.callback.call(); - this.cancelTimer(); - this.unregisterMouseMove(); - } - - this.startTimer = function() { - this.cancelTimer(); - this.timer = window.setTimeout(createDelegate(this, this.onTimerFired), 1500); - } - - this.cancelTimer = function() { - if(this.timer) { - window.clearTimeout(this.timer); - this.timer = null; - } - } - - // Stop tracking mouse movements. - this.unregisterMouseMove= function() { - this.el.onmousemove = null; - } - - this.cancel = function() { - window.chrome.alert("cancel"); - this.cancelTimer(); - this.unregisterMouseMove(); - } - - // If the mouse has moved too much it's not considered a long press, so cancel. - this.onMouseMove = function() { - //window.chrome.alert("LongPress::onMouseMove " + this + " event=" + window.event + - // " " + window.event.clientX + "," + window.event.clientY); - if(Math.abs(this.initialX - window.event.clientX) > 4 || - Math.abs(this.initialY - window.event.clientY) > 4) { - this.cancel(); - } - } - - // Start tracking the mouse and save the initial mouse coords. - this.onMouseDown = function() { - window.chrome.alert("LongPress::onMouseDown " + this); - this.isDown = true; - this.initialX = window.event.clientX; - this.initialY = window.event.clientY; - this.el.onmousemove = this.onMouseMove.bind(this); - this.startTimer(); - } - - this.el.onmousedown = this.onMouseDown.bind(this); - - // Cancel tracking on mouse up and out events, ie. not a long press. - this.el.onmouseup = this.cancel.bind(this); - this.el.onmouseout = this.cancel.bind(this); -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/SearchSuggest.js --- a/ginebra/chrome/js/SearchSuggest.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -//Constructor -function SearchSuggest(){ -} - -var searchArray = new Array(6); -var arrayLimit = 6; -var usercallback; - -SearchSuggest.prototype.loadYahoo = function(query){ - var yUrl = "http://search.yahooapis.com/WebSearchService/V1/relatedSuggestion?"; - var yAppId = "appid=rv9RNS3V34GEz5NvGPBClnQaRVtN1tO57Di0OxX24nfHx1iqNA_QfahxpBoJJw--"; - var yOutput = "&output=json"; - var yResults = "&results = 5"; - var yCallBack = "&callback=SearchSuggest.prototype.processYahoo&query="; - var yahooSuggest = yUrl + yAppId + yOutput + yCallBack + query; - - var headID = document.getElementsByTagName("head")[0]; - var newScript = document.createElement('script'); - newScript.type = 'text/javascript'; - newScript.src = yahooSuggest; - headID.appendChild(newScript); -} - -SearchSuggest.prototype.processYahoo = function(resultObject){ - searchArray = []; - if(resultObject.ResultSet && resultObject.ResultSet.Result){ - var n = arrayLimit < resultObject.ResultSet.Result.length ? arrayLimit : resultObject.ResultSet.Result.length; - for(var i=0; i<n; i++) { - searchArray[i] = resultObject.ResultSet.Result[i]; - } - } - usercallback(searchArray); -} - -SearchSuggest.prototype.loadGoogle = function(query){ - var gUrl = "http://suggestqueries.google.com/complete/search?hl=en&json=t&jsonp="; - var gCallBack = "SearchSuggest.prototype.processGoogle&q="; - var googleSuggest = gUrl + gCallBack + query; - - var headID = document.getElementsByTagName("head")[0]; - var newScript = document.createElement('script'); - newScript.type = 'text/javascript'; - newScript.src = googleSuggest; - headID.appendChild(newScript); -} - -SearchSuggest.prototype.processGoogle = function(resultObject){ - searchArray = []; - if(resultObject){ - var n = arrayLimit < resultObject[1].length ? arrayLimit : resultObject[1].length; - searchArray[0] = resultObject[0]; - for(var i=1; i<n; i++) { - searchArray[i] = resultObject[1][i]; - } - } - usercallback(searchArray); -} - -SearchSuggest.prototype.searchSuggest = function(queryString, getSearchUrl){ - //load yahoo suggest database. this has a limit of 5k hits/day per ip address. - //this.loadYahoo(queryString); - //load google suggest database - this.loadGoogle(queryString); - usercallback = getSearchUrl; -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/SimpleButton.js --- a/ginebra/chrome/js/SimpleButton.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ -// Call SimpleButton to wire an HTML button (typically an <img> tag) to a JS callback -// -// (As opposed to ActionButton which is served all the way through QT Actions) -// -// Params: -// id - the id of the button. Ex: <img id="buttonId" .../> -// upImg - the path to the "up" image for the button. -// downImg - the path to the "down" image for the button. Note: not yet working... -// disabledImg - the path to the "disabled" image for the button. -// handler - the javascript callback to be called when triggered -// -function SimpleButton(id, upImg, downImg, disabledImg, handler) { - this.id = id; - this.upImg = upImg; - this.downImg = downImg; - this.disabledImg = disabledImg; - this.handler = handler; - this.isDown = false; - this.enabled = true; - - // attach this class to the item as "button" for later access - // delete/cleanup existing button (if any) and attach this as button - dom = document.getElementById(this.id); - if(dom.button) { - delete dom.button; - } - dom.button = this; - - this.element = function() { - return document.getElementById(this.id); - } - - this.updateImages = function(upImg, downImg, disabledImg) { - this.upImg = upImg; - this.downImg = downImg; - this.disableImg = disabledImg; - this.updateButton(); - } - - this.updateButton = function() { - if(this.enabled) { - if(this.isDown) { - this.element().src = this.downImg; - } - else { - this.element().src = this.upImg; - } - } - else { - this.element().src = this.disabledImg; - } - } - - this.setEnabled = function(state) { - this.enabled = state; - this.updateButton(); - } - - // Make sure we can find the element. - if(!this.element()) { - alert("SimpleButton: element not found, " + id); - return; - } - -// Commented out because onclick is not reliable. Slight movements between mouse down -// and mouse up seem to cancel the onclick. -// this.onClick = function() { -// //window.chrome.alert("SimpleButton::onClick: " + this); -// this.handler(); -// } - - this.onMouseDown = function() { - //window.chrome.alert("SimpleButton::onMouseDown " + this); - this.isDown = true; - this.updateButton.call(this); - } - - this.onMouseUp = function() { - //window.chrome.alert("SimpleButton::onMouseUp " + this); - this.isDown = false; - this.updateButton.call(this); - this.handler(); - } - - this.onMouseOut = function() { - //window.chrome.alert("SimpleButton::onMouseOut " + this); - if (this.isDown ) { - this.isDown = false; - this.updateButton.call(this); - } - } - - // Set up element event handlers. - this.element().onmousedown = this.onMouseDown.bind(this); - this.element().onmouseup = this.onMouseUp.bind(this); - this.element().onmouseout = this.onMouseOut.bind(this); -// this.element().onclick = this.onClick.bind(this); - - // Set the initial state of the button. - this.updateButton(); -} - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/js/Test.js --- a/ginebra/chrome/js/Test.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ - -// This file contains functions to be used for testing and logging. - -var loadStartTime = new Date().getTime(); -var loadCount = 0; - -// Setup callback for loadStarted signal. -// Called when a new page has started loading. -// -window.pageController.loadStarted.connect( - function() { - loadStartTime = new Date().getTime(); - window.chrome.log("loadStarted:"); - } -); - -// Setup callback for URL changed signal. -// Called when a new page has started loading. -// -window.pageController.currentPageUrlChanged.connect( - function(url) { - window.chrome.log("currentPageUrlChanged: " + url); - } -); - -// Setup callback for loadFinished signal. -// Called when the current page has finished loading. -// 'ok' parameter is false if there was an error (not very reliable). -// -window.pageController.loadFinished.connect( - function(ok) { - window.chrome.log("loadFinished: " + - "load count: " + loadCount + " " + - "load time: " + (new Date().getTime() - loadStartTime) + "ms " + - "ok=" + ok + " " + window.pageController.currentDocUrl); - //window.pageController.currentLoad("http://www.google.com/search?q=help"); - - loadCount++; - - // Load another document. This will effectively keep loading the same document forever. - //setTimeout("window.pageController.currentLoad('http://doc.trolltech.com/4.6/classes.html')",1000); - //setTimeout("window.pageController.currentLoad('http://www.google.com/search?q=help')",1000); - } -); - -// Setup callback for loadProgress signal. -// Called periodically during the load process. -// 'percent' parameter indicates how much of the document has been loaded (0-100). -// -//window.pageController.loadProgress.connect( -// function(percent) { -// window.chrome.log("loadProgress: percent=" + percent); -// window.chrome.alert("loadProgress: percent=" + percent); -// } -//); - -// Setup callback for the chrome's loadComplete signal. -// Called when the chrome finishes loading. -// -window.chrome.loadComplete.connect( - function() { - window.chrome.log("chrome.loadComplete"); - } -); - - \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/back.png Binary file ginebra/chrome/localpages/back.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/bedrock.png Binary file ginebra/chrome/localpages/bedrock.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/bedrock_splash.png Binary file ginebra/chrome/localpages/bedrock_splash.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/button1.png Binary file ginebra/chrome/localpages/button1.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/button2.png Binary file ginebra/chrome/localpages/button2.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/button3.png Binary file ginebra/chrome/localpages/button3.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/button4.png Binary file ginebra/chrome/localpages/button4.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/button_del.png Binary file ginebra/chrome/localpages/button_del.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/google.png Binary file ginebra/chrome/localpages/google.png has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra/chrome/localpages/installnotes.html --- a/ginebra/chrome/localpages/installnotes.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -<html>

This Page Hangs

=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML:null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(K,N,M){if(this[0]){var J=(this[0].ownerDocument||this[0]).createDocumentFragment(),G=o.clean(K,(this[0].ownerDocument||this[0]),J),I=J.firstChild,E=this.length>1?J.cloneNode(true):J;if(I){for(var H=0,F=this.length;H0?E.cloneNode(true):J)}}if(G){o.each(G,z)}}return this;function L(O,P){return N&&o.nodeName(O,"table")&&o.nodeName(P,"tr")?(O.getElementsByTagName("tbody")[0]||O.appendChild(O.ownerDocument.createElement("tbody"))):O}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(G,E,I){if(E=="width"||E=="height"){var K,F={position:"absolute",visibility:"hidden",display:"block"},J=E=="width"?["Left","Right"]:["Top","Bottom"];function H(){K=E=="width"?G.offsetWidth:G.offsetHeight;var M=0,L=0;o.each(J,function(){M+=parseFloat(o.curCSS(G,"padding"+this,true))||0;L+=parseFloat(o.curCSS(G,"border"+this+"Width",true))||0});K-=Math.round(M+L)}if(o(G).is(":visible")){H()}else{o.swap(G,F,H)}return Math.max(0,K)}return o.curCSS(G,E,I)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,R){if(typeof R==="number"){R+=""}if(!R){return}if(typeof R==="string"){R=R.replace(/(<(\w+)[^>]*?)\/>/g,function(T,U,S){return S.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?T:U+">"});var O=o.trim(R).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","

"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div

","

"]||[0,"",""];L.innerHTML=Q[1]+R+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var N=!O.indexOf(""&&O.indexOf("=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(R)){L.insertBefore(K.createTextNode(R.match(/^\s*/)[0]),L.firstChild)}R=o.makeArray(L.childNodes)}if(R.nodeType){G.push(R)}else{G=o.merge(G,R)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha$[^)]*$/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var Q=/((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]+['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,K=0,G=Object.prototype.toString;var F=function(X,T,aa,ab){aa=aa||[];T=T||document;if(T.nodeType!==1&&T.nodeType!==9){return[]}if(!X||typeof X!=="string"){return aa}var Y=[],V,ae,ah,S,ac,U,W=true;Q.lastIndex=0;while((V=Q.exec(X))!==null){Y.push(V[1]);if(V[2]){U=RegExp.rightContext;break}}if(Y.length>1&&L.exec(X)){if(Y.length===2&&H.relative[Y[0]]){ae=I(Y[0]+Y[1],T)}else{ae=H.relative[Y[0]]?[T]:F(Y.shift(),T);while(Y.length){X=Y.shift();if(H.relative[X]){X+=Y.shift()}ae=I(X,ae)}}}else{var ad=ab?{expr:Y.pop(),set:E(ab)}:F.find(Y.pop(),Y.length===1&&T.parentNode?T.parentNode:T,P(T));ae=F.filter(ad.expr,ad.set);if(Y.length>0){ah=E(ae)}else{W=false}while(Y.length){var ag=Y.pop(),af=ag;if(!H.relative[ag]){ag=""}else{af=Y.pop()}if(af==null){af=T}H.relative[ag](ah,af,P(T))}}if(!ah){ah=ae}if(!ah){throw"Syntax error, unrecognized expression: "+(ag||X)}if(G.call(ah)==="[object Array]"){if(!W){aa.push.apply(aa,ah)}else{if(T.nodeType===1){for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&(ah[Z]===true||ah[Z].nodeType===1&&J(T,ah[Z]))){aa.push(ae[Z])}}}else{for(var Z=0;ah[Z]!=null;Z++){if(ah[Z]&&ah[Z].nodeType===1){aa.push(ae[Z])}}}}}else{E(ah,aa)}if(U){F(U,T,aa,ab)}return aa};F.matches=function(S,T){return F(S,null,null,T)};F.find=function(Z,S,aa){var Y,W;if(!Z){return[]}for(var V=0,U=H.order.length;V":function(X,T,Y){if(typeof T==="string"&&!/\W/.test(T)){T=Y?T:T.toUpperCase();for(var U=0,S=X.length;U=0){if(!U){S.push(X)}}else{if(U){T[W]=false}}}}return false},ID:function(S){return S[1].replace(/\\/g,"")},TAG:function(T,S){for(var U=0;S[U]===false;U++){}return S[U]&&P(S[U])?T[1]:T[1].toUpperCase()},CHILD:function(S){if(S[1]=="nth"){var T=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(S[2]=="even"&&"2n"||S[2]=="odd"&&"2n+1"||!/\D/.test(S[2])&&"0n+"+S[2]||S[2]);S[2]=(T[1]+(T[2]||1))-0;S[3]=T[3]-0}S[0]="done"+(K++);return S},ATTR:function(T){var S=T[1].replace(/\\/g,"");if(H.attrMap[S]){T[1]=H.attrMap[S]}if(T[2]==="~="){T[4]=" "+T[4]+" "}return T},PSEUDO:function(W,T,U,S,X){if(W[1]==="not"){if(W[3].match(Q).length>1){W[3]=F(W[3],null,null,T)}else{var V=F.filter(W[3],T,U,true^X);if(!U){S.push.apply(S,V)}return false}}else{if(H.match.POS.test(W[0])){return true}}return W},POS:function(S){S.unshift(true);return S}},filters:{enabled:function(S){return S.disabled===false&&S.type!=="hidden"},disabled:function(S){return S.disabled===true},checked:function(S){return S.checked===true},selected:function(S){S.parentNode.selectedIndex;return S.selected===true},parent:function(S){return !!S.firstChild},empty:function(S){return !S.firstChild},has:function(U,T,S){return !!F(S[3],U).length},header:function(S){return/h\d/i.test(S.nodeName)},text:function(S){return"text"===S.type},radio:function(S){return"radio"===S.type},checkbox:function(S){return"checkbox"===S.type},file:function(S){return"file"===S.type},password:function(S){return"password"===S.type},submit:function(S){return"submit"===S.type},image:function(S){return"image"===S.type},reset:function(S){return"reset"===S.type},button:function(S){return"button"===S.type||S.nodeName.toUpperCase()==="BUTTON"},input:function(S){return/input|select|textarea|button/i.test(S.nodeName)}},setFilters:{first:function(T,S){return S===0},last:function(U,T,S,V){return T===V.length-1},even:function(T,S){return S%2===0},odd:function(T,S){return S%2===1},lt:function(U,T,S){return TS[3]-0},nth:function(U,T,S){return S[3]-0==T},eq:function(U,T,S){return S[3]-0==T}},filter:{CHILD:function(S,V){var Y=V[1],Z=S.parentNode;var X=V[0];if(Z&&(!Z[X]||!S.nodeIndex)){var W=1;for(var T=Z.firstChild;T;T=T.nextSibling){if(T.nodeType==1){T.nodeIndex=W++}}Z[X]=W-1}if(Y=="first"){return S.nodeIndex==1}else{if(Y=="last"){return S.nodeIndex==Z[X]}else{if(Y=="only"){return Z[X]==1}else{if(Y=="nth"){var ab=false,U=V[2],aa=V[3];if(U==1&&aa==0){return true}if(U==0){if(S.nodeIndex==aa){ab=true}}else{if((S.nodeIndex-aa)%U==0&&(S.nodeIndex-aa)/U>=0){ab=true}}return ab}}}}},PSEUDO:function(Y,U,V,Z){var T=U[1],W=H.filters[T];if(W){return W(Y,V,U,Z)}else{if(T==="contains"){return(Y.textContent||Y.innerText||"").indexOf(U[3])>=0}else{if(T==="not"){var X=U[3];for(var V=0,S=X.length;V=0:V==="~="?(" "+X+" ").indexOf(T)>=0:!U[4]?S:V==="!="?X!=T:V==="^="?X.indexOf(T)===0:V==="$="?X.substr(X.length-T.length)===T:V==="|="?X===T||X.substr(0,T.length+1)===T+"-":false},POS:function(W,T,U,X){var S=T[2],V=H.setFilters[S];if(V){return V(W,U,T,X)}}}};var L=H.match.POS;for(var N in H.match){H.match[N]=RegExp(H.match[N].source+/(?![^\[]*\])(?![^$]*$)/.source)}var E=function(T,S){T=Array.prototype.slice.call(T);if(S){S.push.apply(S,T);return S}return T};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(M){E=function(W,V){var T=V||[];if(G.call(W)==="[object Array]"){Array.prototype.push.apply(T,W)}else{if(typeof W.length==="number"){for(var U=0,S=W.length;U";var S=document.documentElement;S.insertBefore(T,S.firstChild);if(!!document.getElementById(U)){H.find.ID=function(W,X,Y){if(typeof X.getElementById!=="undefined"&&!Y){var V=X.getElementById(W[1]);return V?V.id===W[1]||typeof V.getAttributeNode!=="undefined"&&V.getAttributeNode("id").nodeValue===W[1]?[V]:g:[]}};H.filter.ID=function(X,V){var W=typeof X.getAttributeNode!=="undefined"&&X.getAttributeNode("id");return X.nodeType===1&&W&&W.nodeValue===V}}S.removeChild(T)})();(function(){var S=document.createElement("div");S.appendChild(document.createComment(""));if(S.getElementsByTagName("*").length>0){H.find.TAG=function(T,X){var W=X.getElementsByTagName(T[1]);if(T[1]==="*"){var V=[];for(var U=0;W[U];U++){if(W[U].nodeType===1){V.push(W[U])}}W=V}return W}}S.innerHTML="";if(S.firstChild&&S.firstChild.getAttribute("href")!=="#"){H.attrHandle.href=function(T){return T.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var S=F,T=document.createElement("div");T.innerHTML="

";if(T.querySelectorAll&&T.querySelectorAll(".TEST").length===0){return}F=function(X,W,U,V){W=W||document;if(!V&&W.nodeType===9&&!P(W)){try{return E(W.querySelectorAll(X),U)}catch(Y){}}return S(X,W,U,V)};F.find=S.find;F.filter=S.filter;F.selectors=S.selectors;F.matches=S.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){H.order.splice(1,0,"CLASS");H.find.CLASS=function(S,T){return T.getElementsByClassName(S[1])}}function O(T,Z,Y,ac,aa,ab){for(var W=0,U=ac.length;W0){W=S;break}}}S=S[T]}ab[V]=W}}}var J=document.compareDocumentPosition?function(T,S){return T.compareDocumentPosition(S)&16}:function(T,S){return T!==S&&(T.contains?T.contains(S):true)};var P=function(S){return S.nodeType===9&&S.documentElement.nodeName!=="HTML"||!!S.ownerDocument&&P(S.ownerDocument)};var I=function(S,Z){var V=[],W="",X,U=Z.nodeType?[Z]:Z;while((X=H.match.PSEUDO.exec(S))){W+=X[0];S=S.replace(H.match.PSEUDO,"")}S=H.relative[S]?S+"*":S;for(var Y=0,T=U.length;Y=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("

").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}this[H].style.display=o.data(this[H],"olddisplay",K)}}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)==1){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='

';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(H,F){var E=H?"Left":"Top",G=H?"Right":"Bottom";o.fn["inner"+F]=function(){return this[F.toLowerCase()]()+j(this,"padding"+E)+j(this,"padding"+G)};o.fn["outer"+F]=function(J){return this["inner"+F]()+j(this,"border"+E+"Width")+j(this,"border"+G+"Width")+(J?j(this,"margin"+E)+j(this,"margin"+G):0)};var I=F.toLowerCase();o.fn[I]=function(J){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+F]||document.body["client"+F]:this[0]==document?Math.max(document.documentElement["client"+F],document.body["scroll"+F],document.documentElement["scroll"+F],document.body["offset"+F],document.documentElement["offset"+F]):J===g?(this.length?o.css(this[0],I):null):this.css(I,typeof J==="string"?J:J+"px")}})})(); \ No newline at end of file diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/chrome/js/3rdparty/jquery-1.4.2.js --- a/ginebra2/chrome/js/3rdparty/jquery-1.4.2.js Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6240 +0,0 @@ -/*! - * jQuery JavaScript Library v1.4.2 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Sat Feb 13 22:33:48 2010 -0500 - */ -(function( window, undefined ) { - -// Define a local copy of jQuery -var jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context ); - }, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - - // A central reference to the root jQuery(document) - rootjQuery, - - // A simple way to check for HTML strings or ID strings - // (both of which we optimize for) - quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, - - // Is it a simple selector - isSimple = /^.[^:#\[\.,]*$/, - - // Check if a string has a non-whitespace character in it - rnotwhite = /\S/, - - // Used for trimming whitespace - rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, - - // Keep a UserAgent string for use with jQuery.browser - userAgent = navigator.userAgent, - - // For matching the engine and version of the browser - browserMatch, - - // Has the ready events already been bound? - readyBound = false, - - // The functions to execute on DOM ready - readyList = [], - - // The ready event handler - DOMContentLoaded, - - // Save a reference to some core methods - toString = Object.prototype.toString, - hasOwnProperty = Object.prototype.hasOwnProperty, - push = Array.prototype.push, - slice = Array.prototype.slice, - indexOf = Array.prototype.indexOf; - -jQuery.fn = jQuery.prototype = { - init: function( selector, context ) { - var match, elem, ret, doc; - - // Handle $(""), $(null), or $(undefined) - if ( !selector ) { - return this; - } - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - - // The body element only exists once, optimize finding it - if ( selector === "body" && !context ) { - this.context = document; - this[0] = document.body; - this.selector = "body"; - this.length = 1; - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - // Are we dealing with HTML string or an ID? - match = quickExpr.exec( selector ); - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - doc = (context ? context.ownerDocument || context : document); - - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); - - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); - - } else { - selector = [ doc.createElement( ret[1] ) ]; - } - - } else { - ret = buildFragment( [ match[1] ], [ doc ] ); - selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; - } - - return jQuery.merge( this, selector ); - - // HANDLE: $("#id") - } else { - elem = document.getElementById( match[2] ); - - if ( elem ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $("TAG") - } else if ( !context && /^\w+$/.test( selector ) ) { - this.selector = selector; - this.context = document; - selector = document.getElementsByTagName( selector ); - return jQuery.merge( this, selector ); - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return (context || rootjQuery).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return jQuery( context ).find( selector ); - } - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); - } - - if (selector.selector !== undefined) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }, - - // Start with an empty selector - selector: "", - - // The current version of jQuery being used - jquery: "1.4.2", - - // The default length of a jQuery object is 0 - length: 0, - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - toArray: function() { - return slice.call( this, 0 ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == null ? - - // Return a 'clean' array - this.toArray() : - - // Return just the object - ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems, name, selector ) { - // Build a new jQuery matched element set - var ret = jQuery(); - - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); - - } else { - jQuery.merge( ret, elems ); - } - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - ret.context = this.context; - - if ( name === "find" ) { - ret.selector = this.selector + (this.selector ? " " : "") + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - ready: function( fn ) { - // Attach the listeners - jQuery.bindReady(); - - // If the DOM is already ready - if ( jQuery.isReady ) { - // Execute the function immediately - fn.call( document, jQuery ); - - // Otherwise, remember the function for later - } else if ( readyList ) { - // Add the function to the wait list - readyList.push( fn ); - } - - return this; - }, - - eq: function( i ) { - return i === -1 ? - this.slice( i ) : - this.slice( i, +i + 1 ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - end: function() { - return this.prevObject || jQuery(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: [].sort, - splice: [].splice -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.fn.init.prototype = jQuery.fn; - -jQuery.extend = jQuery.fn.extend = function() { - // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( length === i ) { - target = this; - --i; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging object literal values or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) { - var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src - : jQuery.isArray(copy) ? [] : {}; - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - noConflict: function( deep ) { - window.$ = _$; - - if ( deep ) { - window.jQuery = _jQuery; - } - - return jQuery; - }, - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // Handle when the DOM is ready - ready: function() { - // Make sure that the DOM is not already loaded - if ( !jQuery.isReady ) { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 13 ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If there are functions bound, to execute - if ( readyList ) { - // Execute all of them - var fn, i = 0; - while ( (fn = readyList[ i++ ]) ) { - fn.call( document, jQuery ); - } - - // Reset the list of functions - readyList = null; - } - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - } - } - }, - - bindReady: function() { - if ( readyBound ) { - return; - } - - readyBound = true; - - // Catch cases where $(document).ready() is called after the - // browser event has already occurred. - if ( document.readyState === "complete" ) { - return jQuery.ready(); - } - - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); - - // If IE event model is used - } else if ( document.attachEvent ) { - // ensure firing before onload, - // maybe late but safe also for iframes - document.attachEvent("onreadystatechange", DOMContentLoaded); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); - - // If IE and not a frame - // continually check to see if the document is ready - var toplevel = false; - - try { - toplevel = window.frameElement == null; - } catch(e) {} - - if ( document.documentElement.doScroll && toplevel ) { - doScrollCheck(); - } - } - }, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return toString.call(obj) === "[object Function]"; - }, - - isArray: function( obj ) { - return toString.call(obj) === "[object Array]"; - }, - - isPlainObject: function( obj ) { - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) { - return false; - } - - // Not own constructor property must be Object - if ( obj.constructor - && !hasOwnProperty.call(obj, "constructor") - && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - - var key; - for ( key in obj ) {} - - return key === undefined || hasOwnProperty.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - for ( var name in obj ) { - return false; - } - return true; - }, - - error: function( msg ) { - throw msg; - }, - - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { - return null; - } - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@") - .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]") - .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) { - - // Try to use the native JSON parser first - return window.JSON && window.JSON.parse ? - window.JSON.parse( data ) : - (new Function("return " + data))(); - - } else { - jQuery.error( "Invalid JSON: " + data ); - } - }, - - noop: function() {}, - - // Evalulates a script in a global context - globalEval: function( data ) { - if ( data && rnotwhite.test(data) ) { - // Inspired by code by Andrea Giammarchi - // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html - var head = document.getElementsByTagName("head")[0] || document.documentElement, - script = document.createElement("script"); - - script.type = "text/javascript"; - - if ( jQuery.support.scriptEval ) { - script.appendChild( document.createTextNode( data ) ); - } else { - script.text = data; - } - - // Use insertBefore instead of appendChild to circumvent an IE6 bug. - // This arises when a base node is used (#2709). - head.insertBefore( script, head.firstChild ); - head.removeChild( script ); - } - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); - }, - - // args is for internal usage only - each: function( object, callback, args ) { - var name, i = 0, - length = object.length, - isObj = length === undefined || jQuery.isFunction(object); - - if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { - break; - } - } - } else { - for ( var value = object[0]; - i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {} - } - } - - return object; - }, - - trim: function( text ) { - return (text || "").replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( array, results ) { - var ret = results || []; - - if ( array != null ) { - // The window, strings (and functions) also have 'length' - // The extra typeof function check is to prevent crashes - // in Safari 2 (See: #3039) - if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) { - push.call( ret, array ); - } else { - jQuery.merge( ret, array ); - } - } - - return ret; - }, - - inArray: function( elem, array ) { - if ( array.indexOf ) { - return array.indexOf( elem ); - } - - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { - return i; - } - } - - return -1; - }, - - merge: function( first, second ) { - var i = first.length, j = 0; - - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { - first[ i++ ] = second[ j ]; - } - - } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, inv ) { - var ret = []; - - // Go through the array, only saving the items - // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { - if ( !inv !== !callback( elems[ i ], i ) ) { - ret.push( elems[ i ] ); - } - } - - return ret; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var ret = [], value; - - // Go through the array, translating each of the items to their - // new value (or values). - for ( var i = 0, length = elems.length; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - - return ret.concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - proxy: function( fn, proxy, thisObject ) { - if ( arguments.length === 2 ) { - if ( typeof proxy === "string" ) { - thisObject = fn; - fn = thisObject[ proxy ]; - proxy = undefined; - - } else if ( proxy && !jQuery.isFunction( proxy ) ) { - thisObject = proxy; - proxy = undefined; - } - } - - if ( !proxy && fn ) { - proxy = function() { - return fn.apply( thisObject || this, arguments ); - }; - } - - // Set the guid of unique handler to the same of original handler, so it can be removed - if ( fn ) { - proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; - } - - // So proxy can be declared as an argument - return proxy; - }, - - // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { - ua = ua.toLowerCase(); - - var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || - []; - - return { browser: match[1] || "", version: match[2] || "0" }; - }, - - browser: {} -}); - -browserMatch = jQuery.uaMatch( userAgent ); -if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; - jQuery.browser.version = browserMatch.version; -} - -// Deprecated, use jQuery.browser.webkit instead -if ( jQuery.browser.webkit ) { - jQuery.browser.safari = true; -} - -if ( indexOf ) { - jQuery.inArray = function( elem, array ) { - return indexOf.call( array, elem ); - }; -} - -// All jQuery objects should point back to these -rootjQuery = jQuery(document); - -// Cleanup functions for the document ready method -if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - }; - -} else if ( document.attachEvent ) { - DOMContentLoaded = function() { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); - jQuery.ready(); - } - }; -} - -// The DOM ready check for Internet Explorer -function doScrollCheck() { - if ( jQuery.isReady ) { - return; - } - - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch( error ) { - setTimeout( doScrollCheck, 1 ); - return; - } - - // and execute any waiting functions - jQuery.ready(); -} - -function evalScript( i, elem ) { - if ( elem.src ) { - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - } else { - jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); - } - - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } -} - -// Mutifunctional method to get and set values to a collection -// The value/s can be optionally by executed if its a function -function access( elems, key, value, exec, fn, pass ) { - var length = elems.length; - - // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - access( elems, k, key[k], exec, fn, value ); - } - return elems; - } - - // Setting one attribute - if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = !pass && exec && jQuery.isFunction(value); - - for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); - } - - return elems; - } - - // Getting an attribute - return length ? fn( elems[0], key ) : undefined; -} - -function now() { - return (new Date).getTime(); -} -(function() { - - jQuery.support = {}; - - var root = document.documentElement, - script = document.createElement("script"), - div = document.createElement("div"), - id = "script" + now(); - - div.style.display = "none"; - div.innerHTML = "

a"; - - var all = div.getElementsByTagName("*"), - a = div.getElementsByTagName("a")[0]; - - // Can't get basic test support - if ( !all || !all.length || !a ) { - return; - } - - jQuery.support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: div.firstChild.nodeType === 3, - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, - - // Get the style information from getAttribute - // (IE uses .cssText insted) - style: /red/.test( a.getAttribute("style") ), - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: a.getAttribute("href") === "/a", - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55$/.test( a.style.opacity ), - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, - - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: div.getElementsByTagName("input")[0].value === "on", - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected, - - parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null, - - // Will be defined later - deleteExpando: true, - checkClone: false, - scriptEval: false, - noCloneEvent: true, - boxModel: null - }; - - script.type = "text/javascript"; - try { - script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); - } catch(e) {} - - root.insertBefore( script, root.firstChild ); - - // Make sure that the execution of code works by injecting a script - // tag with appendChild/createTextNode - // (IE doesn't support this, fails, and uses .text instead) - if ( window[ id ] ) { - jQuery.support.scriptEval = true; - delete window[ id ]; - } - - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer - try { - delete script.test; - - } catch(e) { - jQuery.support.deleteExpando = false; - } - - root.removeChild( script ); - - if ( div.attachEvent && div.fireEvent ) { - div.attachEvent("onclick", function click() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - jQuery.support.noCloneEvent = false; - div.detachEvent("onclick", click); - }); - div.cloneNode(true).fireEvent("onclick"); - } - - div = document.createElement("div"); - div.innerHTML = ""; - - var fragment = document.createDocumentFragment(); - fragment.appendChild( div.firstChild ); - - // WebKit doesn't clone checked state correctly in fragments - jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked; - - // Figure out if the W3C box model works as expected - // document.body must exist before we can do this - jQuery(function() { - var div = document.createElement("div"); - div.style.width = div.style.paddingLeft = "1px"; - - document.body.appendChild( div ); - jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; - document.body.removeChild( div ).style.display = 'none'; - - div = null; - }); - - // Technique from Juriy Zaytsev - // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ - var eventSupported = function( eventName ) { - var el = document.createElement("div"); - eventName = "on" + eventName; - - var isSupported = (eventName in el); - if ( !isSupported ) { - el.setAttribute(eventName, "return;"); - isSupported = typeof el[eventName] === "function"; - } - el = null; - - return isSupported; - }; - - jQuery.support.submitBubbles = eventSupported("submit"); - jQuery.support.changeBubbles = eventSupported("change"); - - // release memory in IE - root = script = div = all = a = null; -})(); - -jQuery.props = { - "for": "htmlFor", - "class": "className", - readonly: "readOnly", - maxlength: "maxLength", - cellspacing: "cellSpacing", - rowspan: "rowSpan", - colspan: "colSpan", - tabindex: "tabIndex", - usemap: "useMap", - frameborder: "frameBorder" -}; -var expando = "jQuery" + now(), uuid = 0, windowData = {}; - -jQuery.extend({ - cache: {}, - - expando:expando, - - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "embed": true, - "object": true, - "applet": true - }, - - data: function( elem, name, data ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { - return; - } - - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache; - - if ( !id && typeof name === "string" && data === undefined ) { - return null; - } - - // Compute a unique ID for the element - if ( !id ) { - id = ++uuid; - } - - // Avoid generating a new cache unless none exists and we - // want to manipulate it. - if ( typeof name === "object" ) { - elem[ expando ] = id; - thisCache = cache[ id ] = jQuery.extend(true, {}, name); - - } else if ( !cache[ id ] ) { - elem[ expando ] = id; - cache[ id ] = {}; - } - - thisCache = cache[ id ]; - - // Prevent overriding the named cache with undefined values - if ( data !== undefined ) { - thisCache[ name ] = data; - } - - return typeof name === "string" ? thisCache[ name ] : thisCache; - }, - - removeData: function( elem, name ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { - return; - } - - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; - - // If we want to remove a specific section of the element's data - if ( name ) { - if ( thisCache ) { - // Remove the section of cache data - delete thisCache[ name ]; - - // If we've removed all the data, remove the element's cache - if ( jQuery.isEmptyObject(thisCache) ) { - jQuery.removeData( elem ); - } - } - - // Otherwise, we want to remove all of the element's data - } else { - if ( jQuery.support.deleteExpando ) { - delete elem[ jQuery.expando ]; - - } else if ( elem.removeAttribute ) { - elem.removeAttribute( jQuery.expando ); - } - - // Completely remove the data cache - delete cache[ id ]; - } - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - if ( typeof key === "undefined" && this.length ) { - return jQuery.data( this[0] ); - - } else if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - var parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value === undefined ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - if ( data === undefined && this.length ) { - data = jQuery.data( this[0], key ); - } - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - } else { - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() { - jQuery.data( this, key, value ); - }); - } - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); -jQuery.extend({ - queue: function( elem, type, data ) { - if ( !elem ) { - return; - } - - type = (type || "fx") + "queue"; - var q = jQuery.data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( !data ) { - return q || []; - } - - if ( !q || jQuery.isArray(data) ) { - q = jQuery.data( elem, type, jQuery.makeArray(data) ); - - } else { - q.push( data ); - } - - return q; - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), fn = queue.shift(); - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - } - - if ( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift("inprogress"); - } - - fn.call(elem, function() { - jQuery.dequeue(elem, type); - }); - } - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - } - - if ( data === undefined ) { - return jQuery.queue( this[0], type ); - } - return this.each(function( i, elem ) { - var queue = jQuery.queue( this, type, data ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; - type = type || "fx"; - - return this.queue( type, function() { - var elem = this; - setTimeout(function() { - jQuery.dequeue( elem, type ); - }, time ); - }); - }, - - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - } -}); -var rclass = /[\n\t]/g, - rspace = /\s+/, - rreturn = /\r/g, - rspecialurl = /href|src|style/, - rtype = /(button|input)/i, - rfocusable = /(button|input|object|select|textarea)/i, - rclickable = /^(a|area)$/i, - rradiocheck = /radio|checkbox/; - -jQuery.fn.extend({ - attr: function( name, value ) { - return access( this, name, value, true, jQuery.attr ); - }, - - removeAttr: function( name, fn ) { - return this.each(function(){ - jQuery.attr( this, name, "" ); - if ( this.nodeType === 1 ) { - this.removeAttribute( name ); - } - }); - }, - - addClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - self.addClass( value.call(this, i, self.attr("class")) ); - }); - } - - if ( value && typeof value === "string" ) { - var classNames = (value || "").split( rspace ); - - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; - - if ( elem.nodeType === 1 ) { - if ( !elem.className ) { - elem.className = value; - - } else { - var className = " " + elem.className + " ", setClass = elem.className; - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { - setClass += " " + classNames[c]; - } - } - elem.className = jQuery.trim( setClass ); - } - } - } - } - - return this; - }, - - removeClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - self.removeClass( value.call(this, i, self.attr("class")) ); - }); - } - - if ( (value && typeof value === "string") || value === undefined ) { - var classNames = (value || "").split(rspace); - - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; - - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { - var className = (" " + elem.className + " ").replace(rclass, " "); - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[c] + " ", " "); - } - elem.className = jQuery.trim( className ); - - } else { - elem.className = ""; - } - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value, isBool = typeof stateVal === "boolean"; - - if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { - var self = jQuery(this); - self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); - }); - } - - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, i = 0, self = jQuery(this), - state = stateVal, - classNames = value.split( rspace ); - - while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); - } - - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery.data( this, "__className__", this.className ); - } - - // toggle whole className - this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " "; - for ( var i = 0, l = this.length; i < l; i++ ) { - if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { - return true; - } - } - - return false; - }, - - val: function( value ) { - if ( value === undefined ) { - var elem = this[0]; - - if ( elem ) { - if ( jQuery.nodeName( elem, "option" ) ) { - return (elem.attributes.value || {}).specified ? elem.value : elem.text; - } - - // We need to handle select boxes special - if ( jQuery.nodeName( elem, "select" ) ) { - var index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type === "select-one"; - - // Nothing was selected - if ( index < 0 ) { - return null; - } - - // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; - - if ( option.selected ) { - // Get the specifc value for the option - value = jQuery(option).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - } - - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) { - return elem.getAttribute("value") === null ? "on" : elem.value; - } - - - // Everything else, we just grab the value - return (elem.value || "").replace(rreturn, ""); - - } - - return undefined; - } - - var isFunction = jQuery.isFunction(value); - - return this.each(function(i) { - var self = jQuery(this), val = value; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( isFunction ) { - val = value.call(this, i, self.val()); - } - - // Typecast each time if the value is a Function and the appended - // value is therefore different each time. - if ( typeof val === "number" ) { - val += ""; - } - - if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) { - this.checked = jQuery.inArray( self.val(), val ) >= 0; - - } else if ( jQuery.nodeName( this, "select" ) ) { - var values = jQuery.makeArray(val); - - jQuery( "option", this ).each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); - - if ( !values.length ) { - this.selectedIndex = -1; - } - - } else { - this.value = val; - } - }); - } -}); - -jQuery.extend({ - attrFn: { - val: true, - css: true, - html: true, - text: true, - data: true, - width: true, - height: true, - offset: true - }, - - attr: function( elem, name, value, pass ) { - // don't set attributes on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; - } - - if ( pass && name in jQuery.attrFn ) { - return jQuery(elem)[name](value); - } - - var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ), - // Whether we are setting (or getting) - set = value !== undefined; - - // Try to normalize/fix the name - name = notxml && jQuery.props[ name ] || name; - - // Only do all the following if this is a node (faster for style) - if ( elem.nodeType === 1 ) { - // These attributes require special treatment - var special = rspecialurl.test( name ); - - // Safari mis-reports the default selected property of an option - // Accessing the parent's selectedIndex property fixes it - if ( name === "selected" && !jQuery.support.optSelected ) { - var parent = elem.parentNode; - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - } - - // If applicable, access the attribute via the DOM 0 way - if ( name in elem && notxml && !special ) { - if ( set ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } - - elem[ name ] = value; - } - - // browsers index elements by id/name on forms, give priority to attributes. - if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { - return elem.getAttributeNode( name ).nodeValue; - } - - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - if ( name === "tabIndex" ) { - var attributeNode = elem.getAttributeNode( "tabIndex" ); - - return attributeNode && attributeNode.specified ? - attributeNode.value : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - - return elem[ name ]; - } - - if ( !jQuery.support.style && notxml && name === "style" ) { - if ( set ) { - elem.style.cssText = "" + value; - } - - return elem.style.cssText; - } - - if ( set ) { - // convert the value to a string (all browsers do this but IE) see #1070 - elem.setAttribute( name, "" + value ); - } - - var attr = !jQuery.support.hrefNormalized && notxml && special ? - // Some attributes require a special call on IE - elem.getAttribute( name, 2 ) : - elem.getAttribute( name ); - - // Non-existent attributes return null, we normalize to undefined - return attr === null ? undefined : attr; - } - - // elem is actually elem.style ... set the style - // Using attr for specific style information is now deprecated. Use style instead. - return jQuery.style( elem, name, value ); - } -}); -var rnamespaces = /\.(.*)$/, - fcleanup = function( nm ) { - return nm.replace(/[^\w\s\.\|`]/g, function( ch ) { - return "\\" + ch; - }); - }; - -/* - * A number of helper functions used for managing events. - * Many of the ideas behind this code originated from - * Dean Edwards' addEvent library. - */ -jQuery.event = { - - // Bind an event to an element - // Original by Dean Edwards - add: function( elem, types, handler, data ) { - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // For whatever reason, IE has trouble passing the window object - // around, causing it to be cloned in the process - if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) { - elem = window; - } - - var handleObjIn, handleObj; - - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - } - - // Make sure that the function being executed has a unique ID - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure - var elemData = jQuery.data( elem ); - - // If no elemData is found then we must be trying to bind to one of the - // banned noData elements - if ( !elemData ) { - return; - } - - var events = elemData.events = elemData.events || {}, - eventHandle = elemData.handle, eventHandle; - - if ( !eventHandle ) { - elemData.handle = eventHandle = function() { - // Handle the second event of a trigger and when - // an event is called after a page has unloaded - return typeof jQuery !== "undefined" && !jQuery.event.triggered ? - jQuery.event.handle.apply( eventHandle.elem, arguments ) : - undefined; - }; - } - - // Add elem as a property of the handle function - // This is to prevent a memory leak with non-native events in IE. - eventHandle.elem = elem; - - // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = types.split(" "); - - var type, i = 0, namespaces; - - while ( (type = types[ i++ ]) ) { - handleObj = handleObjIn ? - jQuery.extend({}, handleObjIn) : - { handler: handler, data: data }; - - // Namespaced event handlers - if ( type.indexOf(".") > -1 ) { - namespaces = type.split("."); - type = namespaces.shift(); - handleObj.namespace = namespaces.slice(0).sort().join("."); - - } else { - namespaces = []; - handleObj.namespace = ""; - } - - handleObj.type = type; - handleObj.guid = handler.guid; - - // Get the current list of functions bound to this event - var handlers = events[ type ], - special = jQuery.event.special[ type ] || {}; - - // Init the event handler queue - if ( !handlers ) { - handlers = events[ type ] = []; - - // Check for a special event handler - // Only use addEventListener/attachEvent if the special - // events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add the function to the element's handler list - handlers.push( handleObj ); - - // Keep track of which events have been used, for global triggering - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - global: {}, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, pos ) { - // don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, - elemData = jQuery.data( elem ), - events = elemData && elemData.events; - - if ( !elemData || !events ) { - return; - } - - // types is actually an event object here - if ( types && types.type ) { - handler = types.handler; - types = types.type; - } - - // Unbind all events for the element - if ( !types || typeof types === "string" && types.charAt(0) === "." ) { - types = types || ""; - - for ( type in events ) { - jQuery.event.remove( elem, type + types ); - } - - return; - } - - // Handle multiple events separated by a space - // jQuery(...).unbind("mouseover mouseout", fn); - types = types.split(" "); - - while ( (type = types[ i++ ]) ) { - origType = type; - handleObj = null; - all = type.indexOf(".") < 0; - namespaces = []; - - if ( !all ) { - // Namespaced event handlers - namespaces = type.split("."); - type = namespaces.shift(); - - namespace = new RegExp("(^|\\.)" + - jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)") - } - - eventType = events[ type ]; - - if ( !eventType ) { - continue; - } - - if ( !handler ) { - for ( var j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( all || namespace.test( handleObj.namespace ) ) { - jQuery.event.remove( elem, origType, handleObj.handler, j ); - eventType.splice( j--, 1 ); - } - } - - continue; - } - - special = jQuery.event.special[ type ] || {}; - - for ( var j = pos || 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( handler.guid === handleObj.guid ) { - // remove the given handler for the given type - if ( all || namespace.test( handleObj.namespace ) ) { - if ( pos == null ) { - eventType.splice( j--, 1 ); - } - - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - - if ( pos != null ) { - break; - } - } - } - - // remove generic event handler if no more handlers exist - if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - removeEvent( elem, type, elemData.handle ); - } - - ret = null; - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - var handle = elemData.handle; - if ( handle ) { - handle.elem = null; - } - - delete elemData.events; - delete elemData.handle; - - if ( jQuery.isEmptyObject( elemData ) ) { - jQuery.removeData( elem ); - } - } - }, - - // bubbling is internal - trigger: function( event, data, elem /*, bubbling */ ) { - // Event object or event type - var type = event.type || event, - bubbling = arguments[3]; - - if ( !bubbling ) { - event = typeof event === "object" ? - // jQuery.Event object - event[expando] ? event : - // Object literal - jQuery.extend( jQuery.Event(type), event ) : - // Just the event type (string) - jQuery.Event(type); - - if ( type.indexOf("!") >= 0 ) { - event.type = type = type.slice(0, -1); - event.exclusive = true; - } - - // Handle a global trigger - if ( !elem ) { - // Don't bubble custom events when global (to avoid too much overhead) - event.stopPropagation(); - - // Only trigger if we've ever bound an event for it - if ( jQuery.event.global[ type ] ) { - jQuery.each( jQuery.cache, function() { - if ( this.events && this.events[type] ) { - jQuery.event.trigger( event, data, this.handle.elem ); - } - }); - } - } - - // Handle triggering a single element - - // don't do events on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; - } - - // Clean up in case it is reused - event.result = undefined; - event.target = elem; - - // Clone the incoming data, if any - data = jQuery.makeArray( data ); - data.unshift( event ); - } - - event.currentTarget = elem; - - // Trigger the event, it is assumed that "handle" is a function - var handle = jQuery.data( elem, "handle" ); - if ( handle ) { - handle.apply( elem, data ); - } - - var parent = elem.parentNode || elem.ownerDocument; - - // Trigger an inline bound script - try { - if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) { - if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) { - event.result = false; - } - } - - // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} - - if ( !event.isPropagationStopped() && parent ) { - jQuery.event.trigger( event, data, parent, true ); - - } else if ( !event.isDefaultPrevented() ) { - var target = event.target, old, - isClick = jQuery.nodeName(target, "a") && type === "click", - special = jQuery.event.special[ type ] || {}; - - if ( (!special._default || special._default.call( elem, event ) === false) && - !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { - - try { - if ( target[ type ] ) { - // Make sure that we don't accidentally re-trigger the onFOO events - old = target[ "on" + type ]; - - if ( old ) { - target[ "on" + type ] = null; - } - - jQuery.event.triggered = true; - target[ type ](); - } - - // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} - - if ( old ) { - target[ "on" + type ] = old; - } - - jQuery.event.triggered = false; - } - } - }, - - handle: function( event ) { - var all, handlers, namespaces, namespace, events; - - event = arguments[0] = jQuery.event.fix( event || window.event ); - event.currentTarget = this; - - // Namespaced event handlers - all = event.type.indexOf(".") < 0 && !event.exclusive; - - if ( !all ) { - namespaces = event.type.split("."); - event.type = namespaces.shift(); - namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"); - } - - var events = jQuery.data(this, "events"), handlers = events[ event.type ]; - - if ( events && handlers ) { - // Clone the handlers to prevent manipulation - handlers = handlers.slice(0); - - for ( var j = 0, l = handlers.length; j < l; j++ ) { - var handleObj = handlers[ j ]; - - // Filter the functions by class - if ( all || namespace.test( handleObj.namespace ) ) { - // Pass in a reference to the handler function itself - // So that we can later remove it - event.handler = handleObj.handler; - event.data = handleObj.data; - event.handleObj = handleObj; - - var ret = handleObj.handler.apply( this, arguments ); - - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - - if ( event.isImmediatePropagationStopped() ) { - break; - } - } - } - } - - return event.result; - }, - - props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), - - fix: function( event ) { - if ( event[ expando ] ) { - return event; - } - - // store a copy of the original event object - // and "clone" to set read-only properties - var originalEvent = event; - event = jQuery.Event( originalEvent ); - - for ( var i = this.props.length, prop; i; ) { - prop = this.props[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary - if ( !event.target ) { - event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either - } - - // check if target is a textnode (safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && event.fromElement ) { - event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; - } - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && event.clientX != null ) { - var doc = document.documentElement, body = document.body; - event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); - event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); - } - - // Add which for key events - if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) { - event.which = event.charCode || event.keyCode; - } - - // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) - if ( !event.metaKey && event.ctrlKey ) { - event.metaKey = event.ctrlKey; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && event.button !== undefined ) { - event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); - } - - return event; - }, - - // Deprecated, use jQuery.guid instead - guid: 1E8, - - // Deprecated, use jQuery.proxy instead - proxy: jQuery.proxy, - - special: { - ready: { - // Make sure the ready event is setup - setup: jQuery.bindReady, - teardown: jQuery.noop - }, - - live: { - add: function( handleObj ) { - jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); - }, - - remove: function( handleObj ) { - var remove = true, - type = handleObj.origType.replace(rnamespaces, ""); - - jQuery.each( jQuery.data(this, "events").live || [], function() { - if ( type === this.origType.replace(rnamespaces, "") ) { - remove = false; - return false; - } - }); - - if ( remove ) { - jQuery.event.remove( this, handleObj.origType, liveHandler ); - } - } - - }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( this.setInterval ) { - this.onbeforeunload = eventHandle; - } - - return false; - }, - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; - } - } - } - } -}; - -var removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - elem.removeEventListener( type, handle, false ); - } : - function( elem, type, handle ) { - elem.detachEvent( "on" + type, handle ); - }; - -jQuery.Event = function( src ) { - // Allow instantiation without the 'new' keyword - if ( !this.preventDefault ) { - return new jQuery.Event( src ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - // Event type - } else { - this.type = src; - } - - // timeStamp is buggy for some events on Firefox(#3843) - // So we won't rely on the native value - this.timeStamp = now(); - - // Mark it as fixed - this[ expando ] = true; -}; - -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - - // if preventDefault exists run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - } - // otherwise set the returnValue property of the original event to false (IE) - e.returnValue = false; - }, - stopPropagation: function() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - // otherwise set the cancelBubble property of the original event to true (IE) - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -// Checks if an event happened on an element within another element -// Used in jQuery.event.special.mouseenter and mouseleave handlers -var withinElement = function( event ) { - // Check if mouse(over|out) are still within the same parent element - var parent = event.relatedTarget; - - // Firefox sometimes assigns relatedTarget a XUL element - // which we cannot access the parentNode property of - try { - // Traverse up the tree - while ( parent && parent !== this ) { - parent = parent.parentNode; - } - - if ( parent !== this ) { - // set the correct event type - event.type = event.data; - - // handle event if we actually just moused on to a non sub-element - jQuery.event.handle.apply( this, arguments ); - } - - // assuming we've left the element since we most likely mousedover a xul element - } catch(e) { } -}, - -// In case of event delegation, we only need to rename the event.type, -// liveHandler will take care of the rest. -delegate = function( event ) { - event.type = event.data; - jQuery.event.handle.apply( this, arguments ); -}; - -// Create mouseenter and mouseleave events -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - setup: function( data ) { - jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); - }, - teardown: function( data ) { - jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); - } - }; -}); - -// submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function( data, namespaces ) { - if ( this.nodeName.toLowerCase() !== "form" ) { - jQuery.event.add(this, "click.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; - - if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { - return trigger( "submit", this, arguments ); - } - }); - - jQuery.event.add(this, "keypress.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; - - if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { - return trigger( "submit", this, arguments ); - } - }); - - } else { - return false; - } - }, - - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialSubmit" ); - } - }; - -} - -// change delegation, happens here so we have bind. -if ( !jQuery.support.changeBubbles ) { - - var formElems = /textarea|input|select/i, - - changeFilters, - - getVal = function( elem ) { - var type = elem.type, val = elem.value; - - if ( type === "radio" || type === "checkbox" ) { - val = elem.checked; - - } else if ( type === "select-multiple" ) { - val = elem.selectedIndex > -1 ? - jQuery.map( elem.options, function( elem ) { - return elem.selected; - }).join("-") : - ""; - - } else if ( elem.nodeName.toLowerCase() === "select" ) { - val = elem.selectedIndex; - } - - return val; - }, - - testChange = function testChange( e ) { - var elem = e.target, data, val; - - if ( !formElems.test( elem.nodeName ) || elem.readOnly ) { - return; - } - - data = jQuery.data( elem, "_change_data" ); - val = getVal(elem); - - // the current data will be also retrieved by beforeactivate - if ( e.type !== "focusout" || elem.type !== "radio" ) { - jQuery.data( elem, "_change_data", val ); - } - - if ( data === undefined || val === data ) { - return; - } - - if ( data != null || val ) { - e.type = "change"; - return jQuery.event.trigger( e, arguments[1], elem ); - } - }; - - jQuery.event.special.change = { - filters: { - focusout: testChange, - - click: function( e ) { - var elem = e.target, type = elem.type; - - if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) { - return testChange.call( this, e ); - } - }, - - // Change has to be called before submit - // Keydown will be called before keypress, which is used in submit-event delegation - keydown: function( e ) { - var elem = e.target, type = elem.type; - - if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") || - (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || - type === "select-multiple" ) { - return testChange.call( this, e ); - } - }, - - // Beforeactivate happens also before the previous element is blurred - // with this event you can't trigger a change event, but you can store - // information/focus[in] is not needed anymore - beforeactivate: function( e ) { - var elem = e.target; - jQuery.data( elem, "_change_data", getVal(elem) ); - } - }, - - setup: function( data, namespaces ) { - if ( this.type === "file" ) { - return false; - } - - for ( var type in changeFilters ) { - jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); - } - - return formElems.test( this.nodeName ); - }, - - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialChange" ); - - return formElems.test( this.nodeName ); - } - }; - - changeFilters = jQuery.event.special.change.filters; -} - -function trigger( type, elem, args ) { - args[0].type = type; - return jQuery.event.handle.apply( elem, args ); -} - -// Create "bubbling" focus and blur events -if ( document.addEventListener ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - jQuery.event.special[ fix ] = { - setup: function() { - this.addEventListener( orig, handler, true ); - }, - teardown: function() { - this.removeEventListener( orig, handler, true ); - } - }; - - function handler( e ) { - e = jQuery.event.fix( e ); - e.type = fix; - return jQuery.event.handle.call( this, e ); - } - }); -} - -jQuery.each(["bind", "one"], function( i, name ) { - jQuery.fn[ name ] = function( type, data, fn ) { - // Handle object literals - if ( typeof type === "object" ) { - for ( var key in type ) { - this[ name ](key, data, type[key], fn); - } - return this; - } - - if ( jQuery.isFunction( data ) ) { - fn = data; - data = undefined; - } - - var handler = name === "one" ? jQuery.proxy( fn, function( event ) { - jQuery( this ).unbind( event, handler ); - return fn.apply( this, arguments ); - }) : fn; - - if ( type === "unload" && name !== "one" ) { - this.one( type, data, fn ); - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.add( this[i], type, handler, data ); - } - } - - return this; - }; -}); - -jQuery.fn.extend({ - unbind: function( type, fn ) { - // Handle object literals - if ( typeof type === "object" && !type.preventDefault ) { - for ( var key in type ) { - this.unbind(key, type[key]); - } - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.remove( this[i], type, fn ); - } - } - - return this; - }, - - delegate: function( selector, types, data, fn ) { - return this.live( types, data, fn, selector ); - }, - - undelegate: function( selector, types, fn ) { - if ( arguments.length === 0 ) { - return this.unbind( "live" ); - - } else { - return this.die( types, null, fn, selector ); - } - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - - triggerHandler: function( type, data ) { - if ( this[0] ) { - var event = jQuery.Event( type ); - event.preventDefault(); - event.stopPropagation(); - jQuery.event.trigger( event, data, this[0] ); - return event.result; - } - }, - - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, i = 1; - - // link all the functions, so any of them can unbind this click handler - while ( i < args.length ) { - jQuery.proxy( fn, args[ i++ ] ); - } - - return this.click( jQuery.proxy( fn, function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - })); - }, - - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - } -}); - -var liveMap = { - focus: "focusin", - blur: "focusout", - mouseenter: "mouseover", - mouseleave: "mouseout" -}; - -jQuery.each(["live", "die"], function( i, name ) { - jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { - var type, i = 0, match, namespaces, preType, - selector = origSelector || this.selector, - context = origSelector ? this : jQuery( this.context ); - - if ( jQuery.isFunction( data ) ) { - fn = data; - data = undefined; - } - - types = (types || "").split(" "); - - while ( (type = types[ i++ ]) != null ) { - match = rnamespaces.exec( type ); - namespaces = ""; - - if ( match ) { - namespaces = match[0]; - type = type.replace( rnamespaces, "" ); - } - - if ( type === "hover" ) { - types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); - continue; - } - - preType = type; - - if ( type === "focus" || type === "blur" ) { - types.push( liveMap[ type ] + namespaces ); - type = type + namespaces; - - } else { - type = (liveMap[ type ] || type) + namespaces; - } - - if ( name === "live" ) { - // bind live handler - context.each(function(){ - jQuery.event.add( this, liveConvert( type, selector ), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); - }); - - } else { - // unbind live handler - context.unbind( liveConvert( type, selector ), fn ); - } - } - - return this; - } -}); - -function liveHandler( event ) { - var stop, elems = [], selectors = [], args = arguments, - related, match, handleObj, elem, j, i, l, data, - events = jQuery.data( this, "events" ); - - // Make sure we avoid non-left-click bubbling in Firefox (#3861) - if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { - return; - } - - event.liveFired = this; - - var live = events.live.slice(0); - - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { - selectors.push( handleObj.selector ); - - } else { - live.splice( j--, 1 ); - } - } - - match = jQuery( event.target ).closest( selectors, event.currentTarget ); - - for ( i = 0, l = match.length; i < l; i++ ) { - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( match[i].selector === handleObj.selector ) { - elem = match[i].elem; - related = null; - - // Those two events require additional checking - if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { - related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; - } - - if ( !related || related !== elem ) { - elems.push({ elem: elem, handleObj: handleObj }); - } - } - } - } - - for ( i = 0, l = elems.length; i < l; i++ ) { - match = elems[i]; - event.currentTarget = match.elem; - event.data = match.handleObj.data; - event.handleObj = match.handleObj; - - if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) { - stop = false; - break; - } - } - - return stop; -} - -function liveConvert( type, selector ) { - return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&"); -} - -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error").split(" "), function( i, name ) { - - // Handle event binding - jQuery.fn[ name ] = function( fn ) { - return fn ? this.bind( name, fn ) : this.trigger( name ); - }; - - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; - } -}); - -// Prevent memory leaks in IE -// Window isn't included so as not to unbind existing unload events -// More info: -// - http://isaacschlueter.com/2006/10/msie-memory-leaks/ -if ( window.attachEvent && !window.addEventListener ) { - window.attachEvent("onunload", function() { - for ( var id in jQuery.cache ) { - if ( jQuery.cache[ id ].handle ) { - // Try/Catch is to handle iframes being unloaded, see #4280 - try { - jQuery.event.remove( jQuery.cache[ id ].handle.elem ); - } catch(e) {} - } - } - }); -} -/*! - * Sizzle CSS Selector Engine - v1.0 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ - -var chunker = /((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true; - -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. -[0, 0].sort(function(){ - baseHasDuplicate = false; - return 0; -}); - -var Sizzle = function(selector, context, results, seed) { - results = results || []; - var origContext = context = context || document; - - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context), - soFar = selector; - - // Reset the position of the chunker regexp (start from head) - while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) { - soFar = m[3]; - - parts.push( m[1] ); - - if ( m[2] ) { - extra = m[3]; - break; - } - } - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context ); - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); - - while ( parts.length ) { - selector = parts.shift(); - - if ( Expr.relative[ selector ] ) { - selector += parts.shift(); - } - - set = posProcess( selector, set ); - } - } - } else { - // Take a shortcut and set the context if the root selector is an ID - // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - var ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0]; - } - - if ( context ) { - var ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; - - if ( parts.length > 0 ) { - checkSet = makeArray(set); - } else { - prune = false; - } - - while ( parts.length ) { - var cur = parts.pop(), pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } - - if ( pop == null ) { - pop = context; - } - - Expr.relative[ cur ]( checkSet, pop, contextXML ); - } - } else { - checkSet = parts = []; - } - } - - if ( !checkSet ) { - checkSet = set; - } - - if ( !checkSet ) { - Sizzle.error( cur || selector ); - } - - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); - } else if ( context && context.nodeType === 1 ) { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } - } else { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } - } else { - makeArray( checkSet, results ); - } - - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } - - return results; -}; - -Sizzle.uniqueSort = function(results){ - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort(sortOrder); - - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[i-1] ) { - results.splice(i--, 1); - } - } - } - } - - return results; -}; - -Sizzle.matches = function(expr, set){ - return Sizzle(expr, null, null, set); -}; - -Sizzle.find = function(expr, context, isXML){ - var set, match; - - if ( !expr ) { - return []; - } - - for ( var i = 0, l = Expr.order.length; i < l; i++ ) { - var type = Expr.order[i], match; - - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - var left = match[1]; - match.splice(1,1); - - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace(/\\/g, ""); - set = Expr.find[ type ]( match, context, isXML ); - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } - } - } - } - - if ( !set ) { - set = context.getElementsByTagName("*"); - } - - return {set: set, expr: expr}; -}; - -Sizzle.filter = function(expr, set, inplace, not){ - var old = expr, result = [], curLoop = set, match, anyFound, - isXMLFilter = set && set[0] && isXML(set[0]); - - while ( expr && set.length ) { - for ( var type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - var filter = Expr.filter[ type ], found, item, left = match[1]; - anyFound = false; - - match.splice(1,1); - - if ( left.substr( left.length - 1 ) === "\\" ) { - continue; - } - - if ( curLoop === result ) { - result = []; - } - - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; - } else if ( match === true ) { - continue; - } - } - - if ( match ) { - for ( var i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - var pass = not ^ !!found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; - } else { - curLoop[i] = false; - } - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } - - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } - - expr = expr.replace( Expr.match[ type ], "" ); - - if ( !anyFound ) { - return []; - } - - break; - } - } - } - - // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); - } else { - break; - } - } - - old = expr; - } - - return curLoop; -}; - -Sizzle.error = function( msg ) { - throw "Syntax error, unrecognized expression: " + msg; -}; - -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], - match: { - ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:$(even|odd|[\dn+-]*)$)?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:$(\d*)$)?(?=[^-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:$(['"]?)((?:\([^$]+\)|[^]*)+)\2\))?/ - }, - leftMatch: {}, - attrMap: { - "class": "className", - "for": "htmlFor" - }, - attrHandle: { - href: function(elem){ - return elem.getAttribute("href"); - } - }, - relative: { - "+": function(checkSet, part){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !/\W/.test(part), - isPartStrNotTag = isPartStr && !isTag; - - if ( isTag ) { - part = part.toLowerCase(); - } - - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} - - checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; - } - } - - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - ">": function(checkSet, part){ - var isPartStr = typeof part === "string"; - - if ( isPartStr && !/\W/.test(part) ) { - part = part.toLowerCase(); - - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; - } - } - } else { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } - - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, - "": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); - checkFn = dirNodeCheck; - } - - checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); - }, - "~": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); - checkFn = dirNodeCheck; - } - - checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); - } - }, - find: { - ID: function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? [m] : []; - } - }, - NAME: function(match, context){ - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], results = context.getElementsByName(match[1]); - - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } - - return ret.length === 0 ? null : ret; - } - }, - TAG: function(match, context){ - return context.getElementsByTagName(match[1]); - } - }, - preFilter: { - CLASS: function(match, curLoop, inplace, result, not, isXML){ - match = " " + match[1].replace(/\\/g, "") + " "; - - if ( isXML ) { - return match; - } - - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); - } - } else if ( inplace ) { - curLoop[i] = false; - } - } - } - - return false; - }, - ID: function(match){ - return match[1].replace(/\\/g, ""); - }, - TAG: function(match, curLoop){ - return match[1].toLowerCase(); - }, - CHILD: function(match){ - if ( match[1] === "nth" ) { - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( - match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - // calculate the numbers (first)n+(last) including if they are negative - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; - } - - // TODO: Move to normal caching system - match[0] = done++; - - return match; - }, - ATTR: function(match, curLoop, inplace, result, not, isXML){ - var name = match[1].replace(/\\/g, ""); - - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } - - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; - } - - return match; - }, - PSEUDO: function(match, curLoop, inplace, result, not){ - if ( match[1] === "not" ) { - // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - if ( !inplace ) { - result.push.apply( result, ret ); - } - return false; - } - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; - } - - return match; - }, - POS: function(match){ - match.unshift( true ); - return match; - } - }, - filters: { - enabled: function(elem){ - return elem.disabled === false && elem.type !== "hidden"; - }, - disabled: function(elem){ - return elem.disabled === true; - }, - checked: function(elem){ - return elem.checked === true; - }, - selected: function(elem){ - // Accessing this property makes selected-by-default - // options in Safari work properly - elem.parentNode.selectedIndex; - return elem.selected === true; - }, - parent: function(elem){ - return !!elem.firstChild; - }, - empty: function(elem){ - return !elem.firstChild; - }, - has: function(elem, i, match){ - return !!Sizzle( match[3], elem ).length; - }, - header: function(elem){ - return /h\d/i.test( elem.nodeName ); - }, - text: function(elem){ - return "text" === elem.type; - }, - radio: function(elem){ - return "radio" === elem.type; - }, - checkbox: function(elem){ - return "checkbox" === elem.type; - }, - file: function(elem){ - return "file" === elem.type; - }, - password: function(elem){ - return "password" === elem.type; - }, - submit: function(elem){ - return "submit" === elem.type; - }, - image: function(elem){ - return "image" === elem.type; - }, - reset: function(elem){ - return "reset" === elem.type; - }, - button: function(elem){ - return "button" === elem.type || elem.nodeName.toLowerCase() === "button"; - }, - input: function(elem){ - return /input|select|textarea|button/i.test(elem.nodeName); - } - }, - setFilters: { - first: function(elem, i){ - return i === 0; - }, - last: function(elem, i, match, array){ - return i === array.length - 1; - }, - even: function(elem, i){ - return i % 2 === 0; - }, - odd: function(elem, i){ - return i % 2 === 1; - }, - lt: function(elem, i, match){ - return i < match[3] - 0; - }, - gt: function(elem, i, match){ - return i > match[3] - 0; - }, - nth: function(elem, i, match){ - return match[3] - 0 === i; - }, - eq: function(elem, i, match){ - return match[3] - 0 === i; - } - }, - filter: { - PSEUDO: function(elem, match, i, array){ - var name = match[1], filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; - } else if ( name === "not" ) { - var not = match[3]; - - for ( var i = 0, l = not.length; i < l; i++ ) { - if ( not[i] === elem ) { - return false; - } - } - - return true; - } else { - Sizzle.error( "Syntax error, unrecognized expression: " + name ); - } - }, - CHILD: function(elem, match){ - var type = match[1], node = elem; - switch (type) { - case 'only': - case 'first': - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - if ( type === "first" ) { - return true; - } - node = elem; - case 'last': - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - return true; - case 'nth': - var first = match[2], last = match[3]; - - if ( first === 1 && last === 0 ) { - return true; - } - - var doneName = match[0], - parent = elem.parentNode; - - if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { - var count = 0; - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } - parent.sizcache = doneName; - } - - var diff = elem.nodeIndex - last; - if ( first === 0 ) { - return diff === 0; - } else { - return ( diff % first === 0 && diff / first >= 0 ); - } - } - }, - ID: function(elem, match){ - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, - TAG: function(elem, match){ - return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; - }, - CLASS: function(elem, match){ - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, - ATTR: function(elem, match){ - var name = match[1], - result = Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, - POS: function(elem, match, i, array){ - var name = match[2], filter = Expr.setFilters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } - } - } -}; - -var origPOS = Expr.match.POS; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^$]*$)/.source ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){ - return "\\" + (num - 0 + 1); - })); -} - -var makeArray = function(array, results) { - array = Array.prototype.slice.call( array, 0 ); - - if ( results ) { - results.push.apply( results, array ); - return results; - } - - return array; -}; - -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; - -// Provide a fallback method if it does not work -} catch(e){ - makeArray = function(array, results) { - var ret = results || []; - - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); - } else { - if ( typeof array.length === "number" ) { - for ( var i = 0, l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } - } else { - for ( var i = 0; array[i]; i++ ) { - ret.push( array[i] ); - } - } - } - - return ret; - }; -} - -var sortOrder; - -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.compareDocumentPosition ? -1 : 1; - } - - var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( "sourceIndex" in document.documentElement ) { - sortOrder = function( a, b ) { - if ( !a.sourceIndex || !b.sourceIndex ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.sourceIndex ? -1 : 1; - } - - var ret = a.sourceIndex - b.sourceIndex; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( document.createRange ) { - sortOrder = function( a, b ) { - if ( !a.ownerDocument || !b.ownerDocument ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.ownerDocument ? -1 : 1; - } - - var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); - aRange.setStart(a, 0); - aRange.setEnd(a, 0); - bRange.setStart(b, 0); - bRange.setEnd(b, 0); - var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} - -// Utility function for retreiving the text value of an array of DOM nodes -function getText( elems ) { - var ret = "", elem; - - for ( var i = 0; elems[i]; i++ ) { - elem = elems[i]; - - // Get the text from text nodes and CDATA nodes - if ( elem.nodeType === 3 || elem.nodeType === 4 ) { - ret += elem.nodeValue; - - // Traverse everything else, except comment nodes - } else if ( elem.nodeType !== 8 ) { - ret += getText( elem.childNodes ); - } - } - - return ret; -} - -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) -(function(){ - // We're going to inject a fake input element with a specified name - var form = document.createElement("div"), - id = "script" + (new Date).getTime(); - form.innerHTML = ""; - - // Inject it into the root element, check its status, and remove it quickly - var root = document.documentElement; - root.insertBefore( form, root.firstChild ); - - // The workaround has to do additional checks after a getElementById - // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; - } - }; - - Expr.filter.ID = function(elem, match){ - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - return elem.nodeType === 1 && node && node.nodeValue === match; - }; - } - - root.removeChild( form ); - root = form = null; // release memory in IE -})(); - -(function(){ - // Check to see if the browser returns only elements - // when doing getElementsByTagName("*") - - // Create a fake element - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); - - // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function(match, context){ - var results = context.getElementsByTagName(match[1]); - - // Filter out possible comments - if ( match[1] === "*" ) { - var tmp = []; - - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } - - results = tmp; - } - - return results; - }; - } - - // Check to see if an attribute returns normalized href attributes - div.innerHTML = ""; - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { - Expr.attrHandle.href = function(elem){ - return elem.getAttribute("href", 2); - }; - } - - div = null; // release memory in IE -})(); - -if ( document.querySelectorAll ) { - (function(){ - var oldSizzle = Sizzle, div = document.createElement("div"); - div.innerHTML = "

"; - - // Safari can't handle uppercase or unicode characters when - // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; - } - - Sizzle = function(query, context, extra, seed){ - context = context || document; - - // Only use querySelectorAll on non-XML documents - // (ID selectors don't work in non-HTML documents) - if ( !seed && context.nodeType === 9 && !isXML(context) ) { - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(e){} - } - - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - div = null; // release memory in IE - })(); -} - -(function(){ - var div = document.createElement("div"); - - div.innerHTML = "

"; - - // Opera can't find a second classname (in 9.6) - // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { - return; - } - - // Safari caches class attributes, doesn't catch changes (in 3.2) - div.lastChild.className = "e"; - - if ( div.getElementsByClassName("e").length === 1 ) { - return; - } - - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function(match, context, isXML) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); - } - }; - - div = null; // release memory in IE -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem.sizcache = doneName; - elem.sizset = i; - } - - if ( elem.nodeName.toLowerCase() === cur ) { - match = elem; - break; - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem.sizcache = doneName; - elem.sizset = i; - } - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -var contains = document.compareDocumentPosition ? function(a, b){ - return !!(a.compareDocumentPosition(b) & 16); -} : function(a, b){ - return a !== b && (a.contains ? a.contains(b) : true); -}; - -var isXML = function(elem){ - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -var posProcess = function(selector, context){ - var tmpSet = [], later = "", match, - root = context.nodeType ? [context] : context; - - // Position selectors must be done after the filter - // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet ); - } - - return Sizzle.filter( later, tmpSet ); -}; - -// EXPOSE -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.filters; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = getText; -jQuery.isXMLDoc = isXML; -jQuery.contains = contains; - -return; - -window.Sizzle = Sizzle; - -})(); -var runtil = /Until$/, - rparentsprev = /^(?:parents|prevUntil|prevAll)/, - // Note: This RegExp should be improved, or likely pulled from Sizzle - rmultiselector = /,/, - slice = Array.prototype.slice; - -// Implement the identical functionality for filter and not -var winnow = function( elements, qualifier, keep ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - return !!qualifier.call( elem, i, elem ) === keep; - }); - - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return (elem === qualifier) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } - } - - return jQuery.grep(elements, function( elem, i ) { - return (jQuery.inArray( elem, qualifier ) >= 0) === keep; - }); -}; - -jQuery.fn.extend({ - find: function( selector ) { - var ret = this.pushStack( "", "find", selector ), length = 0; - - for ( var i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( var n = length; n < ret.length; n++ ) { - for ( var r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } - } - - return ret; - }, - - has: function( target ) { - var targets = jQuery( target ); - return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); - }, - - filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); - }, - - is: function( selector ) { - return !!selector && jQuery.filter( selector, this ).length > 0; - }, - - closest: function( selectors, context ) { - if ( jQuery.isArray( selectors ) ) { - var ret = [], cur = this[0], match, matches = {}, selector; - - if ( cur && selectors.length ) { - for ( var i = 0, l = selectors.length; i < l; i++ ) { - selector = selectors[i]; - - if ( !matches[selector] ) { - matches[selector] = jQuery.expr.match.POS.test( selector ) ? - jQuery( selector, context || this.context ) : - selector; - } - } - - while ( cur && cur.ownerDocument && cur !== context ) { - for ( selector in matches ) { - match = matches[selector]; - - if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { - ret.push({ selector: selector, elem: cur }); - delete matches[selector]; - } - } - cur = cur.parentNode; - } - } - - return ret; - } - - var pos = jQuery.expr.match.POS.test( selectors ) ? - jQuery( selectors, context || this.context ) : null; - - return this.map(function( i, cur ) { - while ( cur && cur.ownerDocument && cur !== context ) { - if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) { - return cur; - } - cur = cur.parentNode; - } - return null; - }); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - if ( !elem || typeof elem === "string" ) { - return jQuery.inArray( this[0], - // If it receives a string, the selector is used - // If it receives nothing, the siblings are used - elem ? jQuery( elem ) : this.parent().children() ); - } - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - var set = typeof selector === "string" ? - jQuery( selector, context || this.context ) : - jQuery.makeArray( selector ), - all = jQuery.merge( this.get(), set ); - - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); - }, - - andSelf: function() { - return this.add( this.prevObject ); - } -}); - -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); - }, - prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( elem.parentNode.firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( !runtil.test( name ) ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - ret = this.length > 1 ? jQuery.unique( ret ) : ret; - - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - - return this.pushStack( ret, name, slice.call(arguments).join(",") ); - }; -}); - -jQuery.extend({ - filter: function( expr, elems, not ) { - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return jQuery.find.matches(expr, elems); - }, - - dir: function( elem, dir, until ) { - var matched = [], cur = elem[dir]; - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - nth: function( cur, result, dir, elem ) { - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { - break; - } - } - - return cur; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); -var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, - rleadingWhitespace = /^\s+/, - rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g, - rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i, - rtagName = /<([\w:]+)/, - rtbody = /"; - }, - wrapMap = { - option: [ 1, "" ], - legend: [ 1, "

", "

" ], - thead: [ 1, "", "

" ], - tr: [ 2, "", "

" ], - td: [ 3, "", "

" ], - col: [ 2, "", "

" ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] - }; - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// IE can't serialize and

- -

- Release Notes for
- Bedrock Browser Alpha III -

- Updated: 9-Apr-2010
- -
NOTE: These release notes were current as of the time the software was packaged for release. For up-to-date release notes, visit the Browser Team's Wiki pages. -
-

Overview of the Release:

The Bedrock Browser is Nokia's latest web browser based on the latest open-source WebKit - engine and built using the Qt application framework.

The Bedrock project's mission is to provide a fast, easy to use, web-standards based browser - that can compete alongside the best of the mobile browsers.

This release of Bedrock is the Alpha 3 release. While the functionality has certainly has been enhanced - since the Alpha 1 and 2 releases (which were released to a very limited audience) and the performance has also been improved over previous releases, - the performance is still behind where we want and need it to be.

Please review the rest of the Release Notes and provide feedback on this release via the feedback mechanisms available from the Welcome page (press Back) - or on the Backstage site.

Target Platforms/Devices:

The Bedrock Browser is released as a signed SIS package that can be installed on N97 devices. We recommend using a CE device with the latest - firmware patches as opposed to an R&D / prototype devices.

Prerequisites:

Nokia N97 device, consumer version (CE) recommended. Use this release on an R&D / prototype device at your own risk.
Latest platform software loaded/updated onto the device. This release has been tested with: N97 Software Version 12.0.024 dated 04/08/09
Sufficient free space (12-15 MB minimum) on C: drive. HINT: Open the platform browser and clear your browser cache - you'll free up a few MB that way.
NOTE: It is required for this release that you install ALL of the provided software packages on the C: drive.
NOTE: If you had previously installed the Alpha 1 or 2 release OR any version of the Qt framework, please review the installation notes carefully and remove older components from your device as directed.
Default network setup on the device. The N97 connection settings must contain a default Destination Network of "Internet" that contains the proper access points (APs). The browser will connect to the network via this "Internet" Destination Network.
IMPORTANT: Ensure that the default access point (as defined in the connection settings for the Destination Network) is available when running the Bedrock browser. There have been cases where an unavailable WLAN AP prevented loading of pages.

Functionality to Evaluate:

- The following features are a few we encourage you to try out! -

Bookmarking: Add a bookmark by visiting the Bookmarks view and pressing the + button. This will add the current page to your bookmark list.
Most Visited: Press the "Stars" button in the lower right of the main content view to show thumbnails of your most visited pages. After browsing the same pages multiple times, confirm that the Most Visited thumbnails represent your most visited pages!
History: The browser captures page view history in chronilogical groupings. Press the Menu button and choose the History view. Expand and collapse the date groupings. Try clearing all your history using the button in the lower-right of that view.
Searching from URL Entry bar: The URL Entry text field isn't just for entering web page addresses! Try entering a search term like "ski the alps" and the browser will provide search results!
Zooming: Basic incremental zoom-in/zoom-out is available by pressing the zoom button on the main toolbar. Two zoom buttons will then be displayed for zooming in and out.
Zooming: Double-tap "fit-to-block" zooming will zoom/focus in on a block of text or an image. Please also try and give us feedback on Zooming back out using a double-tap gesture.
Viewport scaling: The browser now supports the meta tag options for setting the viewport (display area) for the web page. See below for limitations/impacts. Google "meta viewport" for details on this feature. If you know of sites that use this feature, please try them with the browser.
Windows View: Tap the "Windows" button on the toolbar to open the windows manager and add a new window. Then return to switch between windows.
Session Restore: The browser will restore the previous session including session history in each of any open windows. Try opening multiple windows and browse multiple pages in each. Then exit the browser (red "end" key) and then launch the browser again. All your windows and history should be restored!
Standards Tests: The WebKit engine in this release has been updated and is now doing a much better job on standards tests (like ACID3).
Virtual Keyboard: The Virtual Keyboard should now work OK in portrait (tall) mode of the browser. There still may be some usablity issues, however, when using the VKB to enter text.

Known Limitations:

WebKit Performance: Although improved, there are a number of known issues with the Qt WebKit used in the release of Bedrock.
Out of Memory Handling: Handling of low memory conditions is not yet optimized for browsing large web pages. In some case, loading large or image-intensive pages can cause the browser to lock-up or crash. Please report the sites/pages to us if you experience this.
UI Performance: We are still evaluating and responding to performance issues. When using this Alpha release, please be patient when performing actions. Avoid repeating the same actions quickly in response to a lack of response. Once a button or link is pressed or a touch gesture is applied, it may take some time for the resulting action to be reflected in the UI. Also, sometimes touch gestures are "lost" and you may need to repeat them to activate the control.
Radio Buttons on web pages may not appear: There is a known issue with radio buttons: depending on the UI "theme" used on the device in combination with the zoom factor of the browser and/or page, radio buttons may not be rendered. If you notice this problem, try setting your General Theme to "Nseries 3"
Cursor disappears from URL Entry bar (and other text fields) when editing: This is a known bug that can definitely make it challenging to enter text. Use the hardware keyboard navi-key to scroll inside a text area.
Battery and Signal Strength indicators on the status bar (top) are not "live" and will not update: Don't trust them. Or, consider it a new feature - infinite battery life!
Text Prediction / T9 Issues: Please be sure that when entering any text into any edit field (especially the URL entry box!) that text prediction is turned OFF.

+ Release Notes for
+ Nokia Browser 8.0 TRUNK VERSION +

+ Updated: 2-Jun-2010
+

Overview of the Release:

The Nokia Browser is Nokia's latest web browser based on the latest open-source WebKit + engine and built using the Qt application framework.

The Nokia ASF Browser project's mission is to provide a fast, easy to use, web-standards based browser + that can compete alongside the best of the mobile browsers.

This is the Alpha 4 release of the Nokia Browser. While the functionality has certainly has been enhanced + since the Alpha 1 and 2 releases (which were released to a very limited audience) and the performance has also been improved significantly, + the performance is still behind where we want and need it to be.

Please review the rest of the Release Notes and provide feedback on this release via the feedback mechanisms on the Backstage site.

Target Platforms/Devices:

The Nokia Browser is released as a signed SIS package that can be installed on N97 devices. We recommend using a CE device with the latest + firmware patches as opposed to an R&D / prototype devices.

Prerequisites:

Nokia N97 device, consumer version (CE) recommended. Use this release on an R&D / prototype device at your own risk.
Latest platform software loaded/updated onto the device. This release has been tested with: N97 Software Version 12.0.024 dated 04/08/09
Sufficient free space (11-12 MB minimum) on C: drive. HINT: Open the platform browser and clear your browser cache - you'll free up a few MB that way.
NOTE: It is required for this release that you install ALL of the provided software packages on the C: drive.
NOTE: If you had previously installed the Alpha 1 release OR any version of the Qt framework, please review the installation notes carefully and remove older components from your device as directed..
Default network setup on the device. The N97 connection settings must contain a default Destination Network of "Internet" that contains the proper access points (APs). The browser will connect to the network via this "Internet" Destination Network.
IMPORTANT: Ensure that the default access point (as defined in the connection settings for the Destination Network) is available when running the browser. There have been cases where an unavailable WLAN AP prevented loading of pages.

END OF RELEASE NOTES

Functionality to Evaluate:

Bookmarking - add a bookmark by visiting the Bookmarks view and pressing the + button. This will add the current page to your bookmark list.
Most Visited
History
Searching from URL / Entry bar - no scheme
Zooming: Basic incremental zoom-in/zoom-out is available via the two zoom buttons on the lower toolbar.
Zooming: Double-tap "fit-to-block" zooming will zoom/focus in on a block of text or an image. Please also try and give us feedback on Zooming back out using a double-tap gesture.
Viewport scaling: The browser now supports the meta tag options for setting the viewport (display area) for the web page. See below for limitations/impacts. Google "meta viewport" for details on this feature. If you know of sites that use this feature, please try them with the browser.
Windows View: Tap the "Windows" button on the toolbar to open the windows manager and add a new window. Then return to switch between windows.
GoToAnywhere View: Now includes Bookmarks, History, and Visual History. Try adding a bookmark (it will add a bookmark to the current page in the content view).
Session Restore: The browser will restore the previous session including session history in each of any open windows. Try opening multiple windows and browse multiple pages in each. Then exit the browser (red "end" key) and then launch the browser again. All your windows and history should be restored!
Standards Tests: The WebKit engine in this release has been updated and is now doing a much better job on standards tests (like ACID3).
Navi-key scrolling: The 4-way navi-key and middle "Select" key can now be used to scroll the page and select items.

Known Limitations:

WebKit Performance: Although improved, there are a number of known issues with the Qt WebKit used in the release of the Browser. Some have a major impact on performance of the engine. For example, rendering after a zoom-level change is known to be slow. See our wiki page for more details.
Out of Memory Handling: Handling of low memory conditions is not yet optimized for browsing large web pages. In some case, loading large or image-intensive pages can cause the browser to lock-up or crash. Please report the sites/pages to us if you experience this.
UI Performance: We are still evaluating and responding to performance issues. When using this Alpha release, please be patient when performing actions. Avoid repeating the same actions quickly in response to a lack of response. Once a button or link is pressed or a touch gesture is applied, it may take some time for the resulting action to be reflected in the UI. Also, sometimes touch gestures are "lost" and you may need to repeat them to activate the control.
New for Alpha 3
cursor disappears from URL / Entry bar when editing
Battery, Signal strength are not "live"

OLDER ISSUES - RETEST
Adding a new window: When adding a new "blank" window from the Windows View, the browser may (incorrectly) restore a previously open window instead of creating a new, blank window.
Restoring Session: When launching the browser the previously open windows and pages will be restored. If the pages that were previously open were large or somehow otherwise problematic for the browser, restoring the session might restore those problems as well. If any strange behavior is seen when restoring the last session, try closing as many windows as possible and ensure that each window contains a "simple" page (like Google's search page).
Changing the browser orientation from landscape to portrait and vice-versa is better supported now, but there are some known issues. For example, in any view that shows a page thumbnail, that thumbnail is not updated to reflect the orientation change. Also, entering text in portrait mode is "undefined" at this time - any virtual keyboard that might come up has not been fully tested in that mode. We recommend using the hardware keyboard for text entry.
Form input password fields: Character hiding IS supported when entering a password into a form field, but this is actually problematic. Because no "preview" of the typed character is provided, it is not possible to verify the character typed. Be sure you have the proper text entry mode (lower case, all caps, mixed) set before entering a password.
Secure page indication is now supported, but the indicator may not refresh properly when switching between windows or moving back through history.
HTTP authentication is supported but the masking of the characters as the password is entered is not yet enabled. Also, the HTTP authentication dialog has no "OK" button. Press the hardware Enter key to submit the authentication.
Form field input masking is not yet supported. This can cause some form entry use cases to fail if the data entered is not formatted correctly.
Text Prediction / T9 Issues: Please be sure that when entering any text into any edit field (especially the URL entry box!) that text prediction is turned OFF.
Viewport scaling is supported but in some cases will result in pages that are "clipped" vertically on the page. If pages are not rendered properly (you can sometimes "see" the previous page "under" the offending page) try changing the zoom level.
File downloading is NOT yet supported. If you attempt to load content that isn't rendered in the browser itself, it will NOT be downloaded. So, for example, clicking a link to another HTML page will load/render that page. Clicking a link to a JPG image will load that image into a page in the browser. But clicking a link to a PDF, MP3, ZIP or other type of content file will not result in a download. Nothing will happen.
File uploading via the HTML form <input type="file"... mechanism is NOT supported.
The URL entry bar is now designed to "scroll off" the top of the view when the page is scrolled up. It has been noticed that sometimes the bar will not re-display after scrolling back up.

END OF RELEASE NOTES

diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/chrome/localpages/startpage.css --- a/ginebra2/chrome/localpages/startpage.css Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/chrome/localpages/startpage.css Tue Jun 29 00:46:29 2010 -0400 @@ -23,7 +23,7 @@ margin-left:auto; margin-right:auto; } -img#bedrock_logo { +img#browser_logo { height:40%; display:block; margin-left:auto; @@ -66,6 +66,13 @@ #bottom_pad { height:20%; } +#jerry_sez { + text-align: center; + margin: auto; + display: none; + position: absolute; + left: 20%; +} #release_version { font-family: Arial, Helvetica, sans-serif; font-size:16px; @@ -77,7 +84,7 @@ #browser_version { font-family: Arial, Helvetica, sans-serif; padding-top: 4px; - padding-bottom: 4px; + padding-bottom: 8px; text-align:center; font-size: 14px; color: #666666; diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/chrome/localpages/startpage.html --- a/ginebra2/chrome/localpages/startpage.html Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/chrome/localpages/startpage.html Tue Jun 29 00:46:29 2010 -0400 @@ -1,38 +1,28 @@ - Bedrock Browser Welcome Page + Welcome Page @@ -41,42 +31,50 @@

- ALPHA III +

diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/chrome/localpages/subpage.css --- a/ginebra2/chrome/localpages/subpage.css Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/chrome/localpages/subpage.css Tue Jun 29 00:46:29 2010 -0400 @@ -1,13 +1,13 @@ body { - margin:0px; - text-align: center; - font-family: sans-serif; - font-size: 16px; + margin:0px; + text-align: center; + font-family: sans-serif; + font-size: 16px; - #background-color: #006633; - background-color: #333333; + #background-color: #006633; + background-color: #333333; } img { border-style: none; } @@ -15,36 +15,36 @@ li { padding-top: 10px; } h4 { - font-family: sans-serif; - font-size: 24px; - font-weight: bold; + font-family: sans-serif; + font-size: 24px; + font-weight: bold; } #sub_left { - float: left; - padding-left: 20px; - padding-top: 10px; - width: 290px; + float: left; + padding-left: 20px; + padding-top: 10px; + width: 290px; } #sub_right { - float: right; - padding-right: 20px; - padding-top: 36px; - width: 200px; + float: right; + padding-right: 20px; + padding-top: 36px; + width: 200px; } #rel_notes { - float: clear; - text-align: left; - margin: 20px; - margin-top: 10px; - font-size: 18px; - font-weight: normal; - color: #FFFFFF; + float: clear; + text-align: left; + margin: 20px; + margin-top: 10px; + font-size: 18px; + font-weight: normal; + color: #FFFFFF; } -#start_search { +#start_search { height: 46px; font-size: 20px; color: #115D6E; diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/BrowserMainS60.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ginebra2/emulator/BrowserMainS60.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,114 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#include +#include "BrowserMainS60.h" + +/* + * Handles calls from other apps to QDesktopServices.openUrl + */ + +// This function handles when an app calls QDesktopServices.openUrl when the browser is already started +MCoeMessageObserver::TMessageResponse BrowserMainAppUiS60::HandleMessageL(TUint32 aClientHandleOfTargetWindowGroup, TUid aMessageUid, const TDesC8 &aMessageParameters) +{ + QString url = QString::fromUtf8((const char *)aMessageParameters.Ptr(), aMessageParameters.Length()); + //qDebug() << "BrowserMainAppUiS60::HandleMessageL " << + // QString::fromUtf16(aMessageUid.Name().Ptr(), aMessageUid.Name().Length()) << ", " << url; + // I have no idea if the browser is thread-safe and what will happen when it receives this signal when it's in the middle of something else - mm + GinebraBrowser *urlHandler = ((BrowserMainApplicationS60 *)Application())->UrlHandler(); + if (urlHandler != 0) { + urlHandler->queueOpenUrl(url); + } + return(EMessageHandled); +} + +// void HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) +// { +// qDebug() << "BrowserMainAppUiS60::HandleApplicationSpecificEvent " << aType << ", " << aEvent.EventData(); +// } + +// void OpenFileL(const TDesC& aFilename) +// { +// qDebug() << "BrowserMainAppUiS60::OpenFileL fn - " << QString::fromUtf16(aFilename.Ptr(), aFilename.Length()); +// } + +// void HandleCommandL(TInt aCommand) +// { +// qDebug() << "BrowserMainAppUiS60::HandleCommandL - " << aCommand; +// } + +// These functions handle when an app calls QDesktopServices.openUrl when the browser isn't already started +TBool BrowserMainAppUiS60::ProcessCommandParametersL(TApaCommand aCommand,TFileName& aFilename) +{ + //qDebug() << "BrowserMainAppUiS60:: ProcessCmdParms2 - " << aCommand << ", " << QString::fromUtf16(aFilename.Ptr(), aFilename.Length()); +// ((RealBrowserApp *)QApplication::instance())->setInitialUrl(QString::fromUtf16(aFilename.Ptr(), aFilename.Length())); + ((BrowserMainApplicationS60 *)Application())->SetInitialUrl(QString::fromUtf16(aFilename.Ptr(), aFilename.Length())); + return ETrue; +} + +TBool BrowserMainAppUiS60::ProcessCommandParametersL(TApaCommand aCommand,TFileName& aFilename, const TDesC8& aTail) +{ + //qDebug() + // << "BrowserMainAppUiS60:: ProcessCmdParms3 - " << aCommand << ", " + // << QString::fromUtf16(aFilename.Ptr(), aFilename.Length()) << ", " + // << QString::fromUtf8((const char*)aTail.Ptr(), aTail.Length()); + ((BrowserMainApplicationS60 *)Application())->SetInitialUrl(QString::fromUtf16(aFilename.Ptr(), aFilename.Length())); +// ((RealBrowserApp *)QApplication::instance())->setInitialUrl(QString::fromUtf16(aFilename.Ptr(), aFilename.Length())); + return ETrue; +} + +CEikAppUi *BrowserMainDocumentS60::CreateAppUiL() +{ +// qDebug() << "BrowserMainDocumentS60::CreateAppUiL"; + return new (ELeave) BrowserMainAppUiS60; +} +// CFileStore* OpenFileL(TBool aDoOpen, const TDesC &aFilename, RFs &aFs) +// { +// qDebug() << "BrowserMainDocumentS60::OpenFileL fn - " << QString::fromUtf16(aFilename.Ptr(), aFilename.Length()); +// return 0; +// } +// void OpenFileL(CFileStore*& aFileStore, RFile& aFile) +// { +// aFileStore = NULL; //So the other OpenFileL version is not called +// TFileName name; +// aFile.FullName(name); +// qDebug() << "BrowserMainDocumentS60::OpenFileL fs - " << QString::fromUtf16(name.Ptr(), name.Length()); +// } + +CApaDocument *BrowserMainApplicationS60::CreateDocumentL() +{ +// qDebug() << "BrowserMainApplicationS60::CreateDocumentL"; + return new (ELeave) BrowserMainDocumentS60(*this); +} + +BrowserMainApplicationS60::BrowserMainApplicationS60() : QS60MainApplication(), urlHandler(0) +{ +// CApaCommandLine* commandLine = 0; +// TInt err = CApaCommandLine::GetCommandLineFromProcessEnvironment(commandLine); +// qDebug() << "BrowserMainApplicationS60 - " << QString::fromUtf16(commandLine->DocumentName().Ptr(), commandLine->DocumentName().Length()); +// qDebug() << "BrowserMainApplicationS60"; +// initialUrl = 0; +} + +void BrowserMainApplicationS60::setUrlHandler(GinebraBrowser *uh) +{ + urlHandler = uh; +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/BrowserMainS60.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ginebra2/emulator/BrowserMainS60.h Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,79 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* +* 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. +* +* 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: +* +*/ + +#ifndef BROWSERMAINS60_H_ +#define BROWSERMAINS60_H_ + +#include +#include +#include +#include +#include + +#include "browser.h" +#include "singleton.h" + +/* + * Handles calls from other apps to QDesktopServices.openUrl + */ + +class BrowserMainAppUiS60 : public QS60MainAppUi +{ + public: + BrowserMainAppUiS60() : QS60MainAppUi() {}; + + // This function handles when an app calls QDesktopServices.openUrl when the browser is already started + MCoeMessageObserver::TMessageResponse HandleMessageL(TUint32 aClientHandleOfTargetWindowGroup, TUid aMessageUid, const TDesC8 &aMessageParameters); + + // These functions handle when an app calls QDesktopServices.openUrl when the browser isn't already started + TBool ProcessCommandParametersL(TApaCommand aCommand,TFileName& aFilename); + TBool ProcessCommandParametersL(TApaCommand aCommand,TFileName& aFilename, const TDesC8& aTail); +}; + +class BrowserMainDocumentS60 : public QS60MainDocument +{ + public: + BrowserMainDocumentS60(CEikApplication &eikApp) : QS60MainDocument(eikApp) {}; + CEikAppUi *CreateAppUiL(); +}; + +class BrowserMainApplicationS60 : public QS60MainApplication +{ + + public: + BrowserMainApplicationS60(); + void SetInitialUrl(QString url) { initialUrl = url; } + QString InitialUrl() { return initialUrl; } + void setUrlHandler(GinebraBrowser *uh); + GinebraBrowser *UrlHandler() { return urlHandler; } + + protected: + CApaDocument *CreateDocumentL(); + + private: + QString initialUrl; + GinebraBrowser *urlHandler; +}; + +// Define the Meyer's singleton for BrowserMainApplicationS60 +typedef Singleton CBrowserMainAppSingleton; + +#endif /* BROWSERMAINS60_H_ */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/ChromeConsole.cpp --- a/ginebra2/emulator/ChromeConsole.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/emulator/ChromeConsole.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,26 +1,30 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include "ChromeConsole.h" #include "../ChromeWidget.h" -#include "qwebpage.h" -#include "qwebframe.h" +#include +#include #include "ui_console.h" +#include "bedrockprovisioning.h" ChromeConsole::ChromeConsole(GVA::ChromeWidget *chromeWidget) @@ -38,8 +42,8 @@ // Read the saved state from disk. try { - QFile file("console.dat"); - if(file.open(QIODevice::ReadOnly)) { + QFile file(BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory") + "console.dat"); + if (file.open(QIODevice::ReadOnly)) { QDataStream in(&file); QString str; in >> str; @@ -66,7 +70,6 @@ m_historyIndex = 0; QVariant result = m_chromeWidget->page()->mainFrame()->evaluateJavaScript(expression); - qDebug() << result; return result; } @@ -76,13 +79,13 @@ QVariant result = evaluateExpression(expression); // Figure out the best way to print the result, must be a better way to do this... - if(result == QVariant()) { + if (result == QVariant()) { m_ui->outputEdit->appendPlainText("undefined"); } - else if(result.toString() != "") { + else if (result.toString() != "") { m_ui->outputEdit->appendPlainText(result.toString()); } - else if(result.type() == QVariant::List) { + else if (result.type() == QVariant::List) { m_ui->outputEdit->appendPlainText(result.toStringList().join(",")); } else { @@ -112,21 +115,21 @@ } void ChromeConsole::keyPressEvent(QKeyEvent *event) { - switch(event->key()) { + switch (event->key()) { case Qt::Key_Enter: case Qt::Key_Return: - if(event->modifiers() | Qt::ControlModifier) + if (event->modifiers() | Qt::ControlModifier) evaluate(); break; case Qt::Key_Up: - if(event->modifiers() | Qt::ControlModifier) { - if(m_historyIndex < m_expressionHistory.count() - 1) + if (event->modifiers() | Qt::ControlModifier) { + if (m_historyIndex < m_expressionHistory.count() - 1) m_ui->inputEdit->setPlainText(m_expressionHistory[++m_historyIndex]); } break; case Qt::Key_Down: - if(event->modifiers() | Qt::ControlModifier) { - if(m_historyIndex > 0) + if (event->modifiers() | Qt::ControlModifier) { + if (m_historyIndex > 0) m_ui->inputEdit->setPlainText(m_expressionHistory[--m_historyIndex]); } break; @@ -136,8 +139,8 @@ void ChromeConsole::accept() { // slot try { // Save the state to disk. - QFile file("console.dat"); - if(file.open(QIODevice::WriteOnly)) { + QFile file(BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory") + "console.dat"); + if (file.open(QIODevice::WriteOnly)) { QDataStream out(&file); out << m_ui->outputEdit->toPlainText(); out << m_ui->inputEdit->toPlainText(); diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/ChromeConsole.h --- a/ginebra2/emulator/ChromeConsole.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/emulator/ChromeConsole.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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 CHROMECONSOLE_H #define CHROMECONSOLE_H @@ -26,8 +29,8 @@ /** * \brief Javascript console window for development and testing - * - * The ChromeConsole class displays a simple dialog that allows the user to enter javascript + * + * The ChromeConsole class displays a simple dialog that allows the user to enter javascript * statements into a text field and then execute them in the chrome's javascript engine. * Not used in S60 builds. */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/browser.cpp --- a/ginebra2/emulator/browser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/emulator/browser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,29 +1,33 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include "browser.h" #ifndef NO_QSTM_GESTURE #include "WebGestureHelper.h" #endif +#include "../ChromeLayout.h" #include "../ChromeWidget.h" #include "HistoryFlowView.h" #include "WindowFlowView.h" -#include "WrtPageManager.h" +#include "webpagecontroller.h" #include "bedrockprovisioning.h" #include @@ -40,16 +44,23 @@ #endif #endif -GinebraBrowser::GinebraBrowser(QObject * parent) +GinebraBrowser::GinebraBrowser(QObject * parent, QString *url) : QObject(parent), + m_scene(new QGraphicsScene()), m_splashScreen(NULL) { + // The initial url to go to when the browser is called from another app + if (url != 0) { + m_initialUrl = *url; + } QString startUpChrome(BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("StartUpChrome")); - m_install = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory2") + m_install = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory") + startUpChrome.section('/', 0, -2) + "/"; m_chromeUrl = startUpChrome.section('/', -1); m_contentUrl = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("StartPage"); + setApplicationNameVersion(); + //qDebug() << "GinebraBrowser::GinebraBrowser: " << m_install << " " << m_chromeUrl; //GVA::Settings * settings = GVA::Settings::instance(); //settings->setInstallRoot(m_install); @@ -64,6 +75,7 @@ QString iconDBPath = homeDir.absolutePath() + "/favicon"; QWebSettings::globalSettings()->setIconDatabasePath(iconDBPath);*/ + #ifdef _GVA_INSPECT_CHROME_ QWebSettings * s = m_chrome->page()->settings(); s->setAttribute(QWebSettings::DeveloperExtrasEnabled, true ); @@ -74,21 +86,21 @@ connect(m_chrome->page(), SIGNAL(webInspectorTriggered(QWebElement)), inspector, SLOT(show())); #endif //Create a view onto the chrome - m_view = new GVA::ChromeView(m_chrome); + m_view = new GVA::ChromeView(m_scene, m_chrome); #ifndef NO_QSTM_GESTURE WebGestureHelper* gh = new WebGestureHelper(m_view); browserApp->setGestureHelper(gh); browserApp->setMainWindow(m_view); m_view->grabGesture(QStm_Gesture::assignedType()); #endif - -#ifdef Q_OS_SYMBIAN - m_view->showFullScreen(); + +#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) + m_view->showFullScreen(); #else m_view->setGeometry(0,0,360,640); #endif - showSplashScreen(); + showSplashScreen(); #ifndef __gva_no_chrome__ QObject::connect(m_chrome, SIGNAL(internalChromeComplete()), this, SLOT(onChromeComplete())); @@ -103,17 +115,20 @@ #endif #else onChromeComplete(); - -#endif + +#endif + // Handle openUrl signals + connect(this, SIGNAL(openUrlRequested(QString)), this, SLOT(openUrl(QString))); } -GinebraBrowser::~GinebraBrowser() +GinebraBrowser::~GinebraBrowser() { - delete m_chrome; + delete m_chrome; delete WebPageController::getSingleton(); delete m_view; destroySplashScreen(); + delete m_scene; #ifndef NO_QSTM_GESTURE WebGestureHelper* gh = browserApp->gestureHelper(); @@ -146,7 +161,7 @@ homeDir.rmdir("favicon"); } */ -void GinebraBrowser::show() +void GinebraBrowser::show() { m_view->show(); } @@ -154,66 +169,130 @@ void GinebraBrowser::onChromeComplete() { #ifndef __gva_no_chrome__ - ControllableViewBase *windowView = WRT::WindowFlowView::createNew(m_chrome); + ControllableViewBase *windowView = WRT::WindowFlowView::createNew(m_chrome->layout()); windowView->setObjectName("WindowView"); m_chrome->addView(windowView); + + ControllableViewBase *historyView = WRT::HistoryFlowView::createNew(m_chrome->layout()); + historyView->setObjectName("HistoryView"); + m_chrome->addView(historyView); + #endif //Create a content window and add it to the chrome GVA::GWebContentView *content = new GVA::GWebContentView(m_chrome, 0, "WebView"); - //Load the initial content after the chrome loads. This makes sure that an initial bad //content page won't hang up rendering the chrome. m_chrome->addView(content); - - QString startPage = m_install + m_contentUrl; - qDebug() << "GinebraBrowser::onChromeComplete: startPage: " << startPage; + + QString chromeBaseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("LocalPagesBaseDirectory"); + QString startPage = chromeBaseDir + m_contentUrl; bool enabled = (bool) BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsInt("SaveSession"); - if (enabled) + + // If the browser was launched by some other app calling QDesktopServices.openUrl, go to that url + if (!m_initialUrl.isEmpty()) { + openUrl(m_initialUrl); + } + // Otherwise, load the previous page from history (if that option is enabled) + else if (enabled && m_initialUrl.isEmpty()) { WebPageController::getSingleton()->loadFromHistory(); - else + } + // Otherwise, load the start page + else { content->loadUrlToCurrentPage(startPage); - -#ifndef __gva_no_chrome__ - WRT::HistoryFlowView *historyView = new WRT::HistoryFlowView(WrtPageManager::getSingleton(), m_chrome); - historyView->setObjectName("HistoryView"); - m_chrome->addView(historyView); -#endif + } + m_chrome->showView("WebView"); destroySplashScreen(); } +void GinebraBrowser::queueOpenUrl(QString url) +{ + emit openUrlRequested(url); +} + +void GinebraBrowser::openUrl(QString url) +{ +#ifdef Q_OS_SYMBIAN + // Handle the url as per the old standard at + // http://wiki.forum.nokia.com/index.php/TSS000340_-_Launching_the_Web_browser_on_S60_3rd_Edition_to_open_a_specified_URL + QChar urlType = url.at(0); + // Bookmark (by uid) - not handled + if (urlType == '1') { + return; + } + // Saved deck (by uid) - not handled + else if (urlType == '2') { + return; + } + // Start page - not handled + else if (urlType == '5') { + return; + } + // Bookmark folder (by uid) - not handled + else if (urlType == '6') { + return; + } + // Url or Url + space + access point + else if (urlType == '4') { + url = url.mid(2); // Get the real url + if (url.contains(' ')) { // Chop off the access point if there is one because it's not currently handled + url = url.left(url.indexOf(' ')); + } + } + // If no number then it's just a plain url +#endif /* Q_OS_SYMBIAN */ + // Bring the browser to the front (QDesktopServices openurl is supposed to do this but doesn't) + if (m_view) { + m_view->activateWindow(); + m_view->raise(); + } + m_contentUrl = url; + WebPageController::getSingleton()->loadInitialUrlFromOtherApp(url); +// GVA::GWebContentView *webView = (GVA::GWebContentView *)m_chrome->getView("WebView"); +// if (webView != 0) { +// m_contentUrl = url; +// webView->loadUrlToCurrentPage(url); +// } +} + void GinebraBrowser::showSplashScreen() { QString splashImage = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("SplashImage"); - QString baseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory2"); - QString imagePath = baseDir + splashImage; - - qDebug() << "ChromeView::showSplashScreen: " << imagePath; - if(!imagePath.isNull()) { + QString baseDir = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("ChromeBaseDirectory"); + QString imagePath = baseDir + splashImage; + + if (!imagePath.isNull()) { m_splashScreen = new QLabel(NULL); m_splashScreen->setAlignment(Qt::AlignCenter); m_splashScreen->setStyleSheet("background-color: #FFF"); m_splashScreen->setPixmap(QPixmap(imagePath)); - if(m_splashScreen->pixmap()->isNull()) { + if (m_splashScreen->pixmap()->isNull()) { ;//qDebug() << "ChromeView::chromeLoaded: ERROR splashscreen creation failed. " << imagePath; } else { - m_splashScreen->show(); - #ifdef Q_OS_SYMBIAN - m_splashScreen->showFullScreen(); - m_view->showFullScreen(); - #else - m_splashScreen->setGeometry(0,0,360,640); - #endif + m_splashScreen->show(); + #ifdef Q_OS_SYMBIAN + m_splashScreen->showFullScreen(); + m_view->showFullScreen(); + #else + m_splashScreen->setGeometry(0,0,360,640); + #endif } } } void GinebraBrowser::destroySplashScreen() { - if(m_splashScreen) + if (m_splashScreen) { delete m_splashScreen; m_splashScreen = NULL; } } + +void GinebraBrowser::setApplicationNameVersion() +{ + QCoreApplication::setApplicationName(BEDROCK_APPLICATION_NAME); + QString browserAppVersion = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("BedrockVersion"); + QCoreApplication::setApplicationVersion(browserAppVersion); +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/browser.h --- a/ginebra2/emulator/browser.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/emulator/browser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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 __GINEBRA_BROWSER_H__ #define __GINEBRA_BROWSER_H__ @@ -27,20 +30,28 @@ class GinebraBrowser : public QObject { - Q_OBJECT + Q_OBJECT public: - GinebraBrowser( QObject * parent = 0); + GinebraBrowser( QObject * parent = 0, QString *url = 0); ~GinebraBrowser(); void show(); void showSplashScreen(); void destroySplashScreen(); + void setApplicationNameVersion(); /* private: QDir getHomeDir(); void removeFaviconDir(); */ + void queueOpenUrl(QString url); + + signals: + void openUrlRequested(QString url); + public slots: void onChromeComplete(); + void openUrl(QString); + private: QString m_install; QString m_chromeUrl; @@ -48,7 +59,9 @@ QString m_installBase; GVA::ChromeWidget * m_chrome; GVA::ChromeView * m_view; + QGraphicsScene *m_scene; QLabel *m_splashScreen; // Owned + QString m_initialUrl; }; #endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/emulator/main.cpp --- a/ginebra2/emulator/main.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/emulator/main.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include #include #include @@ -31,14 +34,14 @@ #include #include "browser.h" +#include "bedrockprovisioning.h" + #include //#define HARDWARE_DEBUG_TRACE -#ifdef ENABLE_PERF_TRACE - #include "wrtperftracer.h" - // Global reference to WrtPerfTracer - WrtPerfTracer* g_wrtPerfTracing; +#ifdef ENABLE_PERF_TRACE +#include "wrtperftracer.h" #endif #ifdef HARDWARE_DEBUG_TRACE @@ -54,13 +57,13 @@ static void debugOutput(QtMsgType type, const char *msg) { QFile file(DebugLogPath); - + if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) return; - + QTextStream out(&file); out << "\nDebug: " << msg; - + file.flush(); file.close(); } @@ -109,33 +112,147 @@ static BrowserProxyFactory proxies; #endif //NO_NETWORK_ACCESS_MANAGER -#ifdef ENABLE_PERF_TRACE - WrtPerfTracer* perfTracer = 0; -#endif +#ifdef ORBIT_UI +#include +#endif // ORBIT_UI + +#ifdef OPENURL +#include "BrowserMainS60.h" + +static CApaApplication *AppFactoryL() +{ + return(&CBrowserMainAppSingleton::Instance()); +} +#endif // OPENURL + + +static void configureHtml5OfflineStorage() +{ + BEDROCK_PROVISIONING::BedrockProvisioning * provisioning = + BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning(); + + QWebSettings * globalSettings = QWebSettings::globalSettings(); + + // Enable all kinds of persistent storage, then fine-tune using + // bedrock provisioning attributes. + + QWebSettings::enablePersistentStorage(); + + // Local and database storage (using the global javascript localStorage + // and openDatabase items) is shared across pages and browser invocations, + // but it tied to the domain of the page in which the javascript code is + // running. This allows webpages hosted at, say, cnn.com to store data + // using the same keys as webpages hosted at bbc.co.uk without conflict. + // + // Note that local and database storage is persisted in directories + // beneath the application's private directory, so it is not shared + // with other browsers. + + bool localStorageEnabled = + provisioning->valueAsInt("Html5LocalStorage") != 0; + + bool databaseStorageEnabled = + provisioning->valueAsInt("Html5DatabaseStorage") != 0; + + globalSettings->setAttribute( + QWebSettings::LocalStorageEnabled, + localStorageEnabled); + + globalSettings->setAttribute( + QWebSettings::OfflineStorageDatabaseEnabled, + databaseStorageEnabled); + + // There is no separate QWebSettings method to configure + // the default quota for local storage databases. + // It appears that both local storage and database storage + // use the same default quota. + + if (localStorageEnabled || databaseStorageEnabled) { + globalSettings->setOfflineStorageDefaultQuota( + provisioning->valueAsInt64("Html5DatabaseStorageMaxSize")); + } + + // The application cache allows websites to specify a manifest file in + // the outermost element. The manifest file defines which files + // may be stored at the client and used when the network is inaccessible. + // + // Webkit stores the application cache in a single SQLite database + // named ApplicationCache.db. By default this database is located + // in the application's private directory, so it is not shared with + // other browsers. + + bool applicationCacheEnabled = + provisioning->valueAsInt("Html5ApplicationCache") != 0; + + globalSettings->setAttribute( + QWebSettings::OfflineWebApplicationCacheEnabled, + applicationCacheEnabled); + + if (applicationCacheEnabled) { + globalSettings->setOfflineWebApplicationCacheQuota( + provisioning->valueAsInt64("Html5ApplicationCacheMaxSize")); + } +} + int main(int argc, char * argv[]) { -#ifdef NO_NETWORK_ACCESS_MANAGER +#ifdef NO_NETWORK_ACCESS_MANAGER QNetworkProxyFactory::setApplicationProxyFactory(&proxies); -#endif //NO_NETWORK_ACCESS_MANAGER +#endif //NO_NETWORK_ACCESS_MANAGER int res=0; #ifdef HARDWARE_DEBUG_TRACE - initDebugOutput(); + initDebugOutput(); qInstallMsgHandler(debugOutput); #endif +// qDebug() << "main - before app, argc=" << argc; +// for (int i = 0; i < argc; ++i) +// { +// qDebug() << "main - argv[" << i << "] = " << argv[i]; +// } + +/* openurl should only work in Orbit UI application. */ +#ifdef ORBIT_UI +#ifdef OPENURL +#ifdef NO_QSTM_GESTURE + HbApplication app(AppFactoryL, argc, argv); +#else + BrowserApp app(AppFactoryL, argc, argv); +#endif +#else /* !OPENURL */ +#ifdef NO_QSTM_GESTURE + HbApplication app(argc, argv); +#else // ORBIT_UI + BrowserApp app(argc, argv); +#endif +#endif /* OPENURL */ +#else #ifdef NO_QSTM_GESTURE QApplication app(argc, argv); #else BrowserApp app(argc, argv); #endif +#endif // ORBIT_UI +// qDebug() << "main - after app"; #ifdef Q_OS_SYMBIAN - //Object cache settings. NB: these need to be tuned per device - QWebSettings::globalSettings()->setObjectCacheCapacities(128*1024, 1024*1024, 1024*1024); + //Object cache settings. NB: these need to be tuned per device + QWebSettings::globalSettings()->setObjectCacheCapacities(128*1024, 1024*1024, 1024*1024); #endif + if (BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->value("DnsPrefetchEnabled").toBool()) + { + // Specifies whether QtWebkit will try to pre-fetch DNS entries to speed up browsing. + // Without this technique, the DNS lookup is performed only when you click on the link, + // adding a wait of 250ms (on average) before the page even starts to show up. + // This only works as a global attribute. + QWebSettings::globalSettings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true); + } + + configureHtml5OfflineStorage(); + QString lang = QLocale::system().name(); //install the common translator from platform @@ -143,7 +260,7 @@ common.load(":/resource/qt/translations/common_" + lang); QApplication::installTranslator(&common); - + //install the translator from Browser QTranslator translator; QString transFilePath = ":/translations"; @@ -152,26 +269,54 @@ QString transFile = QLatin1String("browserLoc_") + lang; translator.load(transFile, transFilePath); QApplication::installTranslator(&translator); + +// To make the native urlsearch bar selection visible, the following lines have to be removed +// The keypad navigation still works for ginebra2 even without enabling keypad navigation +/* #ifdef Q_OS_SYMBIAN QApplication::setKeypadNavigationEnabled(true); #endif +*/ +#ifdef OPENURL + // Handle QDesktopServices.openUrl (when browser wasn't already running) + QString url = CBrowserMainAppSingleton::Instance().InitialUrl(); + GinebraBrowser * browser = new GinebraBrowser(0, &url); // Pass the initial url so it will be loaded as soon as the browser chrome finishes + // Set things up to handle QDesktopServices.openUrl calls when browser is already running + CBrowserMainAppSingleton::Instance().setUrlHandler(browser); +#else GinebraBrowser * browser = new GinebraBrowser(); +#endif + #ifdef ENABLE_PERF_TRACE - g_wrtPerfTracing = new WrtPerfTracer(0); +#if defined(NO_NETWORK_ACCESS_MANAGER) + PERF_TRACE_OUT() << "NO_NETWORK_ACCESS_MANAGER\n"; +#endif +#if defined(NO_RESIZE_ON_LOAD) + PERF_TRACE_OUT() << "NO_RESIZE_ON_LOAD\n"; +#endif +#if defined(NO_QSTM_GESTURE) + PERF_TRACE_OUT() << "NO_QSTM_GESTURE\n"; +#endif +#if defined(__gva_no_chrome__) + PERF_TRACE_OUT() << "__gva_no_chrome__\n"; +#endif +#if defined(SET_DEFAULT_IAP) + PERF_TRACE_OUT() << "SET_DEFAULT_IAP\n"; +#endif +#if defined(NO_HISTORY) + PERF_TRACE_OUT() << "NO_HISTORY\n"; +#endif + #endif //ENABLE_PERF_TRACE - + browser->show(); res = app.exec(); delete browser; - -#ifdef ENABLE_PERF_TRACE - // delete g_wrtPerfTracing instance - if (g_wrtPerfTracing) { - g_wrtPerfTracing->close(); - delete g_wrtPerfTracing; - } + +#ifdef ENABLE_PERF_TRACE + WrtPerfTracer::tracer()->close(); #endif //ENABLE_PERF_TRACE - + return res; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/ginebra.dox --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ginebra2/ginebra.dox Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,36 @@ +// This file contains additional documentation for classes defined +// in common code. It can be used to describe how those classes +// are used by Ginebra. + + /*! \ingroup JavascriptAPI + * \class WebPageController + * + * Javascript object name: "pageController" + * Example javascript code to connect to the page controller's pageLoadStarted signal and print + * the current URL to debug output. + * \code + * window.pageController.pageLoadStarted.connect( + * function() { + * app.debug("Load start" + window.pageController.currentRequestedUrl); + * } + * ); + * \endcode + */ + + /*! \ingroup JavascriptAPI + * \class WRT::BookmarksManager + * + * Javascript object name: "bookmarksManager" + * Example javascript code to get bookmarks data in JSON format. + * \code + * var bookmarkData = bookmarksManager.getBookmarksJSON(); + * \endcode + */ + + /*! \ingroup JavascriptAPI + * \class ViewEventContext + */ + +/*! \ingroup JavascriptAPI + * \brief Javascript wrapper for QActions. + */ diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/ginebra2.pro --- a/ginebra2/ginebra2.pro Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/ginebra2.pro Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,28 @@ # # Copyright (c) 2010 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". +# +# 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. # -# Initial Contributors: -# Nokia Corporation - initial contribution. +# 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: # TEMPLATE = app -TARGET = Bedrock +TARGET = NokiaBrowser + +include($$PWD/../flags.pri) # Everything should be relative to ROOT_DIR (makes cut-and-paste safer). ROOT_DIR = $$PWD/.. @@ -27,9 +33,11 @@ ROOT_DIR = $$PWD/.. include($$ROOT_DIR/browserui.pri) + # Common build options, library includes (browsercore etc), and Qt settings. include($$ROOT_DIR/common/commonExternals.pri) INCLUDEPATH += $$PWD/ContentViews +INCLUDEPATH += $$PWD/Charms # Gesture lib @@ -38,9 +46,16 @@ INCLUDEPATH += $$PWD/../qstmgesturelib INCLUDEPATH += $$PWD/../qstmgesturelib/qstmfilelogger LIBS += -lqstmgesturelib - LIBPATH += $$ROOT_DIR/app/browser/qstmgesturelib/output/bin + #LIBPATH += $$ROOT_DIR/app/browser/qstmgesturelib/output/bin } +contains(DEFINES, ENABLE_PERF_TRACE) { + message("ginebra2.pro: Tracing is ON") + LIBS += -lbrperftrace + INCLUDEPATH += $$PWD/../internal/tests/perfTracing +} + + # Common SOURCES, HEADERS from app # include($$ROOT_DIR/app/common/platform/platform.pri) # include($$ROOT_DIR/app/common/common.pri) @@ -48,7 +63,7 @@ TRANSLATIONS += $$PWD/translations/browserLoc.ts # ;;; Following can presumably go away if we will also use Qt's QtWebKit -win32: { +win32: { # adding the WRT bin directory to LIBPATH so that we can pickup QtWebkit.lib CONFIG(release, debug|release):WRT_BIN_DIR = $$PWD/../../../WrtBuild/Release/bin CONFIG(debug, debug|release):WRT_BIN_DIR = $$PWD/../../../WrtBuild/Debug/bin @@ -79,28 +94,36 @@ ChromeRenderer.h \ ChromeSnippet.h \ LocaleDelegate.h \ + ChromeEffect.h \ + ChromeLayout.h \ ChromeWidget.h \ ChromeWidgetJSObject.h \ ChromeView.h \ - ContentViews\GWebContentViewJSObject.h \ - ContentViews\GWebContentViewWidget.h \ - ContentViews\GWebContentView.h \ + ContentViews/GWebContentViewJSObject.h \ + ContentViews/GWebContentViewWidget.h \ + ContentViews/GWebContentView.h \ + ContentViews/GContentViewTouchNavigation.h \ + ContentViews/SuperPageView.h \ DeviceDelegate.h \ + NetworkDelegate.h \ VisibilityAnimator.h \ + ChromeItem.h \ PopupWebChromeItem.h \ WebChromeItem.h \ WebChromeSnippet.h \ WebChromeContainerSnippet.h \ GGraphicsWebView.h \ GWebPage.h \ + GSuperWebPage.h \ GraphicsItemAnimation.h \ NativeChromeItem.h \ - ScrollZoomWidget.h \ SlidingWidget.h \ - TextEditItem.h \ - BlueChromeSnippet.h \ - GreenChromeSnippet.h \ - ProgressSnippet.h \ + Charms\ObjectCharm.h \ + Charms\ExternalEventCharm.h \ + PageSnippet.h \ + PageItem.h \ + ProgressBarItem.h \ + ProgressBarSnippet.h \ Snippets.h \ ScriptObjects.h \ animators/FadeAnimator.h \ @@ -111,21 +134,34 @@ ViewStack.h \ GWebTouchNavigation.h \ KineticHelper.h \ - iconsnippet.h \ - iconwidget.h \ + Toolbar.h \ ToolbarChromeItem.h \ + ToolbarSnippet.h \ ContentToolbarChromeItem.h \ + ContentToolbarSnippet.h \ + DualButtonToolbarSnippet.h \ + WindowToolbarSnippet.h \ + BookmarksToolbarSnippet.h \ + SettingsToolbarSnippet.h \ + RecentUrlToolbarSnippet.h \ UrlSearchSnippet.h \ + Downloads.h \ + GAlternateFileChooser.h \ linearflowsnippet.h \ mostvisitedpageview.h \ - mostvisitedsnippet.h + mostvisitedsnippet.h \ + EditorWidget.h \ + EditorSnippet.h -contains(DEFINES, ENABLE_PERF_TRACE) { - HEADERS += $$PWD/../internal/tests/perfTracing/wrtperftracer.h +symbian: { + contains(br_default_iap, yes) { + DEFINES += SET_DEFAULT_IAP + HEADERS += sym_iap_util.h + } } -contains(DEFINES, SET_DEFAULT_IAP) { - HEADERS += sym_iap_util.h +contains(br_tiled_backing_store, yes) { + DEFINES += BEDROCK_TILED_BACKING_STORE } !contains(DEFINES, NO_QSTM_GESTURE) { @@ -133,7 +169,22 @@ WebTouchNavigation.h } - +contains(DEFINES, BEDROCK_TILED_BACKING_STORE) { + HEADERS += ContentViews/ScrollableWebContentView.h \ + ContentViews/ViewportMetaData.h \ + ContentViews/ViewportMetaDataParser.h \ + ContentViews/WebContentAnimationItem.h \ + ContentViews/WebContentViewWidget.h \ + ContentViews/WebView.h \ + Gestures/GestureEvent.h \ + Gestures/GestureListener.h \ + Gestures/GestureRecognizer.h \ + Gestures/GestureRecognizer_p.h \ + Kinetics/KineticScrollable.h \ + Kinetics/KineticScroller.h \ + ScrollableViewBase.h +} + SOURCES = \ ActionButton.cpp \ ActionButtonSnippet.cpp \ @@ -143,29 +194,38 @@ ChromeRenderer.cpp \ ChromeSnippet.cpp \ LocaleDelegate.cpp \ + ChromeEffect.cpp \ + ChromeLayout.cpp \ ChromeWidget.cpp \ ChromeWidgetJSObject.cpp \ ChromeView.cpp \ - ContentViews\GWebContentViewJSObject.cpp \ - ContentViews\GWebContentViewWidget.cpp \ - ContentViews\GWebContentView.cpp \ + ContentViews/GWebContentViewJSObject.cpp \ + ContentViews/GWebContentViewWidget.cpp \ + ContentViews/GWebContentView.cpp \ + ContentViews/GContentViewTouchNavigation.cpp \ + ContentViews/SuperPageView.cpp \ DeviceDelegate.cpp \ + NetworkDelegate.cpp \ VisibilityAnimator.cpp \ + ChromeItem.cpp \ PopupWebChromeItem.cpp \ WebChromeItem.cpp \ WebChromeSnippet.cpp \ WebChromeContainerSnippet.cpp \ GGraphicsWebView.cpp \ GraphicsItemAnimation.cpp \ + GWebPage.cpp \ + GSuperWebPage.cpp \ NativeChromeItem.cpp \ Snippets.cpp \ ScriptObjects.cpp \ - ScrollZoomWidget.cpp \ SlidingWidget.cpp \ - TextEditItem.cpp \ - BlueChromeSnippet.cpp \ - GreenChromeSnippet.cpp \ - ProgressSnippet.cpp \ + Charms\ObjectCharm.cpp \ + Charms\ExternalEventCharm.cpp \ + PageSnippet.cpp \ + PageItem.cpp \ + ProgressBarItem.cpp \ + ProgressBarSnippet.cpp \ animators/FadeAnimator.cpp \ animators/SlideAnimator.cpp \ emulator/main.cpp \ @@ -175,248 +235,145 @@ ViewStack.cpp \ GWebTouchNavigation.cpp \ KineticHelper.cpp \ - iconsnippet.cpp \ - iconwidget.cpp \ ToolbarChromeItem.cpp \ + ToolbarSnippet.cpp \ ContentToolbarChromeItem.cpp \ + ContentToolbarSnippet.cpp \ + DualButtonToolbarSnippet.cpp \ + WindowToolbarSnippet.cpp \ + BookmarksToolbarSnippet.cpp \ + SettingsToolbarSnippet.cpp \ + RecentUrlToolbarSnippet.cpp \ UrlSearchSnippet.cpp \ - mostvisitedpageview.cpp \ + Downloads.cpp \ + GAlternateFileChooser.cpp \ linearflowsnippet.cpp \ - mostvisitedsnippet.cpp - -contains(IMPORT_SUBDIRS, downloadmgr) { - HEADERS += Downloads.h - SOURCES += Downloads.cpp -} - - -contains(DEFINES, ENABLE_PERF_TRACE) { - SOURCES += $$PWD/../internal/tests/perfTracing/wrtperftracer.cpp -} + mostvisitedpageview.cpp \ + mostvisitedsnippet.cpp \ + EditorWidget.cpp \ + EditorSnippet.cpp !contains(DEFINES, NO_QSTM_GESTURE) { SOURCES += WebGestureHelper.cpp \ - WebTouchNavigation.cpp + WebTouchNavigation.cpp +} + +contains(DEFINES, BEDROCK_TILED_BACKING_STORE) { + SOURCES += ContentViews/ScrollableWebContentView.cpp \ + ContentViews/ViewportMetaData.cpp \ + ContentViews/ViewportMetaDataParser.cpp \ + ContentViews/WebContentAnimationItem.cpp \ + ContentViews/WebContentViewWidget.cpp \ + ContentViews/WebView.cpp \ + Gestures/GestureEvent.cpp \ + Gestures/GestureRecognizer.cpp \ + Kinetics/KineticScroller.cpp \ + ScrollableViewBase.cpp } - - FORMS += emulator/ui/console.ui -contains(what, devicedelegate) { +contains(br_mobility_sysinfo, yes) { CONFIG += mobility - MOBILITY = bearer systeminfo - DEFINES += QT_MOBILITY_BEARER_SYSINFO + MOBILITY = systeminfo + DEFINES += QT_MOBILITY_SYSINFO +} + +contains(br_mobility_sysinfo, yes) { + HEADERS += SystemDeviceImpl.h \ + SystemNetworkImpl.h + SOURCES += SystemDeviceImpl.cpp \ + SystemNetworkImpl.cpp +} + +contains(br_mobility_bearer, yes) { + DEFINES += QT_MOBILITY_BEARER_MANAGEMENT } -symbian: { +contains(br_orbit_ui, yes) { + INCLUDEPATH += /epoc32/include/mw/hb/hbcore \ + /epoc32/include/mw/hb/hbwidgets + LIBS += -lHbCore -lHbWidgets + DEFINES += ORBIT_UI +} + +symbian: { TARGET.EPOCALLOWDLLDATA = 1 TARGET.EPOCSTACKSIZE = 0x14000 - TARGET.EPOCHEAPSIZE = 0x20000 \ - 0x2000000 \ - // \ - Min \ - 128kB, \ - Max \ - 32MB - TARGET.CAPABILITY = All -TCB -DRM -AllFiles + + lessThan(QT_MAJOR_VERSION, 4) | lessThan(QT_MINOR_VERSION, 6) | lessThan(QT_PATCH_VERSION, 3) { + TARGET.EPOCHEAPSIZE = 0x20000 \ + 0x4000000 \ + // \ + Min \ + 128kB, \ + Max \ + 64MB + emulatorHeapSize = \ + "$${LITERAL_HASH}ifdef WINSCW" \ + "EPOCHEAPSIZE 0x20000 0x2000000 // Min 128kB, Max 32MB" \ + "$${LITERAL_HASH}endif" + MMP_RULES += emulatorHeapSize + } else { + # Set conditional Epoc Heap Size + EHZ.WINSCW = "EPOCHEAPSIZE 0x20000 0x2000000" + EHZ.default = "EPOCHEAPSIZE 0x20000 0x4000000" + # Add the conditional MMP rules + MYCONDITIONS = WINSCW + MYVARIABLES = EHZ + addMMPRules(MYCONDITIONS, MYVARIABLES) + } + + TARGET.CAPABILITY = All -TCB -DRM -AllFiles ICON = ./browserIcon.svg - contains(what, plat_101) { + contains(browser_addon, no) { TARGET.UID3 = 0x10008D39 } else { TARGET.UID3 = 0x200267DF } LIBS += -lcommdb - LIBS += -lesock -lconnmon -contains(what, plat_101 ) { - DEFINES += PLAT_101 -} else { - LIBS += -lstandaloneallocator.lib + LIBS += -lesock -lconnmon -linsock + +contains(br_openurl, yes) { + DEFINES += OPENURL +} + +contains(br_fast_allocator, yes) { + LIBS += -lstandaloneallocator.lib } LIBS += -lhal -lsysutil - chrome.sources = ./chrome/*.htm \ - ./chrome/*.js \ - ./chrome/*.css - chrome.path = /data/Others/ginebra2/chrome - DEPLOYMENT += chrome - - # for all chromes - globaljs.sources = ./chrome/js/*.htm \ - ./chrome/js/*.js \ - ./chrome/js/*.css - globaljs.path = /data/Others/ginebra2/chrome/js - CHROME_DEPLOYS += globaljs - # localpages localpages.sources = ./chrome/localpages/*.htm* \ ./chrome/localpages/*.js \ ./chrome/localpages/*.css \ ./chrome/localpages/*.jpg \ - ./chrome/localpages/*.png - localpages.path = /data/Others/ginebra2/chrome/localpages - CHROME_DEPLOYS += localpages + ./chrome/localpages/*.png + localpages.path = ./localpages + DEPLOYMENT += localpages -!contains(DEFINES, NO_QSTM_GESTURE) { +!contains(DEFINES, NO_QSTM_GESTURE) { qstmgesturelib.sources = qstmgesturelib.dll qstmgesturelib.path = /sys/bin DEPLOYMENT += qstmgesturelib } - - chromehtml.sources = ./chrome/bedrockchrome/*.htm* \ - ./chrome/bedrockchrome/*.js \ - ./chrome/bedrockchrome/*.css - chromehtml.path = /data/Others/ginebra2/chrome/bedrockchrome - BEDROCKCHROME_DEPLOYS += chromehtml - - globaljsthp.sources = ./chrome/js/3rdparty/*.htm* \ - ./chrome/js/3rdparty/*.js \ - ./chrome/js/3rdparty/*.css - globaljsthp.path = /data/Others/ginebra2/chrome/js/3rdparty - CHROME_DEPLOYS += globaljsthp - - globaljsjui.sources = ./chrome/js/3rdparty/jquery-ui/*.htm* \ - ./chrome/js/3rdparty/jquery-ui/*.js \ - ./chrome/js/3rdparty/jquery-ui/*.css - globaljsjui.path = /data/Others/ginebra2/chrome/js/3rdparty/jquery-ui - CHROME_DEPLOYS += globaljsjui - - statusbar.sources = ./chrome/bedrockchrome/statusbar.snippet/*.htm* \ - ./chrome/bedrockchrome/statusbar.snippet/*.js \ - ./chrome/bedrockchrome/statusbar.snippet/*.css - statusbar.path = /data/Others/ginebra2/chrome/bedrockchrome/statusbar.snippet - BEDROCKCHROME_DEPLOYS += statusbar - - statusbaricons.sources = ./chrome/bedrockchrome/statusbar.snippet/icons/*.png - statusbaricons.path = /data/Others/ginebra2/chrome/bedrockchrome/statusbar.snippet/icons - BEDROCKCHROME_DEPLOYS += statusbaricons - - statusbariconsbattery.sources = ./chrome/bedrockchrome/statusbar.snippet/icons/battery/*.png - statusbariconsbattery.path = /data/Others/ginebra2/chrome/bedrockchrome/statusbar.snippet/icons/battery - BEDROCKCHROME_DEPLOYS += statusbariconsbattery - - statusbariconssignal.sources = ./chrome/bedrockchrome/statusbar.snippet/icons/signal/*.png - statusbariconssignal.path = /data/Others/ginebra2/chrome/bedrockchrome/statusbar.snippet/icons/signal - BEDROCKCHROME_DEPLOYS += statusbariconssignal - - toolbar.sources = ./chrome/bedrockchrome/toolbar.snippet/*.htm* \ - ./chrome/bedrockchrome/toolbar.snippet/*.js \ - ./chrome/bedrockchrome/toolbar.snippet/*.css - toolbar.path = /data/Others/ginebra2/chrome/bedrockchrome/toolbar.snippet - BEDROCKCHROME_DEPLOYS += toolbar - - toolbaricons.sources = ./chrome/bedrockchrome/toolbar.snippet/icons/*.png - toolbaricons.path = /data/Others/ginebra2/chrome/bedrockchrome/toolbar.snippet/icons - BEDROCKCHROME_DEPLOYS += toolbaricons - - download.sources = ./chrome/bedrockchrome/download.snippet/*.htm* \ - ./chrome/bedrockchrome/download.snippet/*.js \ - ./chrome/bedrockchrome/download.snippet/*.css - download.path = /data/Others/ginebra2/chrome/bedrockchrome/download.snippet - BEDROCKCHROME_DEPLOYS += download - - downloadicons.sources = ./chrome/bedrockchrome/download.snippet/icons/*.png - downloadicons.path = /data/Others/ginebra2/chrome/bedrockchrome/download.snippet/icons - BEDROCKCHROME_DEPLOYS += downloadicons - - contextmenu.sources = ./chrome/bedrockchrome/contextmenu.snippet/*.htm* \ - ./chrome/bedrockchrome/contextmenu.snippet/*.js \ - ./chrome/bedrockchrome/contextmenu.snippet/*.css - contextmenu.path = /data/Others/ginebra2/chrome/bedrockchrome/contextmenu.snippet - BEDROCKCHROME_DEPLOYS += contextmenu - - contexticons.sources = ./chrome/bedrockchrome/contextmenu.snippet/icons/*.png - contexticons.path = /data/Others/ginebra2/chrome/bedrockchrome/contextmenu.snippet/icons - BEDROCKCHROME_DEPLOYS += contexticons - - urlsearch.sources = ./chrome/bedrockchrome/urlsearch.snippet/*.htm* \ - ./chrome/bedrockchrome/urlsearch.snippet/*.js \ - ./chrome/bedrockchrome/urlsearch.snippet/*.css - urlsearch.path = /data/Others/ginebra2/chrome/bedrockchrome/urlsearch.snippet - BEDROCKCHROME_DEPLOYS += urlsearch - urlsearchicons.sources = ./chrome/bedrockchrome/urlsearch.snippet/icons/*.png - urlsearchicons.path = /data/Others/ginebra2/chrome/bedrockchrome/urlsearch.snippet/icons - BEDROCKCHROME_DEPLOYS += urlsearchicons - - suggests.sources = ./chrome/bedrockchrome/suggests.snippet/*.htm* \ - ./chrome/bedrockchrome/suggests.snippet/*.js \ - ./chrome/bedrockchrome/suggests.snippet/*.css - suggests.path = /data/Others/ginebra2/chrome/bedrockchrome/suggests.snippet - BEDROCKCHROME_DEPLOYS += suggests - - windowcount.sources = ./chrome/bedrockchrome/windowcount.snippet/*.htm* \ - ./chrome/bedrockchrome/windowcount.snippet/*.js \ - ./chrome/bedrockchrome/windowcount.snippet/*.css - windowcount.path = /data/Others/ginebra2/chrome/bedrockchrome/windowcount.snippet - BEDROCKCHROME_DEPLOYS += windowcount - - networkstatus.sources = ./chrome/bedrockchrome/networkstatus.snippet/*.htm* \ - ./chrome/bedrockchrome/networkstatus.snippet/*.js \ - ./chrome/bedrockchrome/networkstatus.snippet/*.css - networkstatus.path = /data/Others/ginebra2/chrome/bedrockchrome/networkstatus.snippet - BEDROCKCHROME_DEPLOYS += networkstatus - - windowcounticons.sources = ./chrome/bedrockchrome/windowcount.snippet/icons/*.png - windowcounticons.path = /data/Others/ginebra2/chrome/bedrockchrome/windowcount.snippet/icons - BEDROCKCHROME_DEPLOYS += windowcounticons - - zoombar.sources = ./chrome/bedrockchrome/zoombar.snippet/*.htm* \ - ./chrome/bedrockchrome/zoombar.snippet/*.js \ - ./chrome/bedrockchrome/zoombar.snippet/*.css - zoombar.path = /data/Others/ginebra2/chrome/bedrockchrome/zoombar.snippet - BEDROCKCHROME_DEPLOYS += zoombar +contains(DEFINES, ENABLE_PERF_TRACE) { + brperftrace.sources = brperftrace.dll + brperftrace.path = /sys/bin + DEPLOYMENT += brperftrace +} - zoombaricons.sources = ./chrome/bedrockchrome/zoombar.snippet/icons/*.png - zoombaricons.path = /data/Others/ginebra2/chrome/bedrockchrome/zoombar.snippet/icons - BEDROCKCHROME_DEPLOYS += zoombaricons - - bookmarkview.sources = ./chrome/bedrockchrome/bookmarkview.superpage/*.htm* \ - ./chrome/bedrockchrome/bookmarkview.superpage/*.js \ - ./chrome/bedrockchrome/bookmarkview.superpage/*.css - bookmarkview.path = /data/Others/ginebra2/chrome/bedrockchrome/bookmarkview.superpage - BEDROCKCHROME_DEPLOYS += bookmarkview - - bookmarkviewicons.sources = ./chrome/bedrockchrome/bookmarkview.superpage/icons/*.png \ - ./chrome/bedrockchrome/bookmarkview.superpage/icons/*.gif \ - ./chrome/bedrockchrome/bookmarkview.superpage/icons/*.db - bookmarkviewicons.path = /data/Others/ginebra2/chrome/bedrockchrome/bookmarkview.superpage/icons - BEDROCKCHROME_DEPLOYS += bookmarkviewicons - - historyview.sources = ./chrome/bedrockchrome/historyview.superpage/*.htm* \ - ./chrome/bedrockchrome/historyview.superpage/*.js \ - ./chrome/bedrockchrome/historyview.superpage/*.css - historyview.path = /data/Others/ginebra2/chrome/bedrockchrome/historyview.superpage - BEDROCKCHROME_DEPLOYS += historyview - - historyviewicons.sources = ./chrome/bedrockchrome/historyview.superpage/icons/*.png - historyviewicons.path = /data/Others/ginebra2/chrome/bedrockchrome/historyview.superpage/icons - BEDROCKCHROME_DEPLOYS += historyviewicons - - settingsview.sources = ./chrome/bedrockchrome/settingsview.superpage/*.htm* \ - ./chrome/bedrockchrome/settingsview.superpage/*.js \ - ./chrome/bedrockchrome/settingsview.superpage/*.css - settingsview.path = /data/Others/ginebra2/chrome/bedrockchrome/settingsview.superpage - BEDROCKCHROME_DEPLOYS += settingsview - - settingsviewicons.sources = ./chrome/bedrockchrome/settingsview.superpage/icons/*.png \ - ./chrome/bedrockchrome/settingsview.superpage/icons/*.gif \ - ./chrome/bedrockchrome/settingsview.superpage/icons/*.db - settingsviewicons.path = /data/Others/ginebra2/chrome/bedrockchrome/settingsview.superpage/icons - BEDROCKCHROME_DEPLOYS += settingsviewicons - - - # Deploy common chrome files. - DEPLOYMENT += $$CHROME_DEPLOYS - - # Deploy bedrock chrome files. - DEPLOYMENT += $$BEDROCKCHROME_DEPLOYS + contains(browser_addon, no) { + HEADERS += emulator/BrowserMainS60.h + SOURCES += emulator/BrowserMainS60.cpp +} } #unix: { - # Create symbolic link to executable. + # Create symbolic link to executable. # QMAKE_POST_LINK += ln -sf $$DESTDIR/$$TARGET $$PWD/$$TARGET; #} @@ -425,7 +382,7 @@ # Generate documentation # ################################# dox.target = docs -dox.commands = doxygen ./doc/doxyfile +dox.commands = doxygen ./doc/Doxyfile dox.depends = $$SOURCES $$HEADERS QMAKE_EXTRA_UNIX_TARGETS += dox diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/ginebra2.qrc --- a/ginebra2/ginebra2.qrc Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/ginebra2.qrc Tue Jun 29 00:46:29 2010 -0400 @@ -1,6 +1,175 @@ - - - chrome/demochrome/Scroll.png - translations/browserLoc.qm - - \ No newline at end of file + + + translations/browserLoc.qm + translations/browserLoc_zh.qm + chrome/localpages/bedrock_splash.png + chrome/js/3rdparty/jquery-ui/effects.core.js + chrome/js/3rdparty/jquery-ui/ui.core.js + chrome/js/3rdparty/jquery-ui/effects.blind.js + chrome/js/3rdparty/jquery-ui/ui.sortable.js + chrome/js/3rdparty/jquery-1.4.2.min.js + chrome/js/LongPress.js + chrome/js/Bind.js + chrome/js/SimpleButton.js + chrome/js/Test.js + chrome/js/ContextMenu.js + chrome/bedrockchrome/settingsview.superpage/SettingsView.html + chrome/bedrockchrome/settingsview.superpage/settingsview.css + chrome/bedrockchrome/settingsview.superpage/LegalNotice.html + chrome/bedrockchrome/settingsview.superpage/icons.old/list_headerbg_open.png + chrome/bedrockchrome/settingsview.superpage/icons.old/list_itembg.png + chrome/bedrockchrome/settingsview.superpage/icons.old/list_headerarrow_open.png + chrome/bedrockchrome/settingsview.superpage/icons.old/list_headerarrow_closed.png + chrome/bedrockchrome/settingsview.superpage/icons.old/list_headerbg_closed.png + chrome/bedrockchrome/settingsview.superpage/settingsview.js + chrome/bedrockchrome/settingsview.superpage/icons/no_selected.png + chrome/bedrockchrome/settingsview.superpage/icons/no_deselected.png + chrome/bedrockchrome/settingsview.superpage/icons/broom_sweep.gif + chrome/bedrockchrome/settingsview.superpage/icons/list_headerarrow_open.png + chrome/bedrockchrome/settingsview.superpage/icons/list_headerarrow_closed.png + chrome/bedrockchrome/settingsview.superpage/icons/yes_deselected.png + chrome/bedrockchrome/settingsview.superpage/icons/broom_sweep.png + chrome/bedrockchrome/settingsview.superpage/icons/yes_selected.png + chrome/bedrockchrome/settingsview.superpage/icons/delete_btn.png + chrome/bedrockchrome/settingsview.superpage/icons/delete_btn_pressed.png + chrome/bedrockchrome/settingsview.superpage/icons/yes_btn.png + chrome/bedrockchrome/settingsview.superpage/icons/yes_btn_pressed.png + chrome/bedrockchrome/networkstatus.snippet/networkstatus.js + chrome/bedrockchrome/networkstatus.snippet/networkstatus.css + chrome/bedrockchrome/networkstatus.snippet/icons/button_dialog_ok_wait.png + chrome/bedrockchrome/networkstatus.snippet/icons/button_dialog_ok_press.png + chrome/bedrockchrome/networkstatus.snippet/icons/icon_dialog_error.png + chrome/bedrockchrome/urlsearch.snippet/icons/stop_btn.png + chrome/bedrockchrome/urlsearch.snippet/icons/stop_btn_pressed.png + chrome/bedrockchrome/urlsearch.snippet/icons/refresh_btn.png + chrome/bedrockchrome/urlsearch.snippet/icons/go_btn.png + chrome/bedrockchrome/urlsearch.snippet/icons/refresh_btn_pressed.png + chrome/bedrockchrome/urlsearch.snippet/icons/go_btn_pressed.png + chrome/bedrockchrome/prompt.snippet/prompt.js + chrome/bedrockchrome/prompt.snippet/prompt.css + chrome/bedrockchrome/prompt.snippet/icons/button_dialog_ok_wait.png + chrome/bedrockchrome/prompt.snippet/icons/button_dialog_ok_press.png + chrome/bedrockchrome/prompt.snippet/icons/icon_dialog_error.png + chrome/bedrockchrome/contextmenu.snippet/ContextMenu.css + chrome/bedrockchrome/contextmenu.snippet/ViewContextMenu.js + chrome/bedrockchrome/contextmenu.snippet/ContextMenu.js + chrome/bedrockchrome/contextmenu.snippet/icons/menu_tail.png + chrome/bedrockchrome/contextmenu.snippet/icons/nav_selected.png + chrome/bedrockchrome/contextmenu.snippet/icons/nav_deselected.png + chrome/bedrockchrome/contextmenu.snippet/icons/links_deselected.png + chrome/bedrockchrome/contextmenu.snippet/icons/page_deselected.png + chrome/bedrockchrome/contextmenu.snippet/icons/page_selected.png + chrome/bedrockchrome/contextmenu.snippet/icons/links_selected.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_zoom_disabled.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_feedback_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_back_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_toggle_partialTB.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_toggle_fullTB.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_clearall_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_toggle_fullTB_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_menu.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_mostvisited_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_clearall_disabled.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_zoom_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_zoom.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_mostvisited.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_add.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_clearall.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_back.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_menu_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_back_disabled.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_add_pressed.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_add_disabled.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_feedback.png + chrome/bedrockchrome/toolbar.snippet/icons/icon_toggle_partialTB_pressed.png + chrome/bedrockchrome/chrome.css + chrome/bedrockchrome/historyview.superpage/clearhistorydialog.css + chrome/bedrockchrome/historyview.superpage/historyview.css + chrome/bedrockchrome/historyview.superpage/clearhistorydialog.js + chrome/bedrockchrome/historyview.superpage/historyview.js + chrome/bedrockchrome/historyview.superpage/historyView.html + chrome/bedrockchrome/historyview.superpage/icons/list_headerbg_open.png + chrome/bedrockchrome/historyview.superpage/icons/button_dialog_history_clear_cancel_press.png + chrome/bedrockchrome/historyview.superpage/icons/list_itembg.png + chrome/bedrockchrome/historyview.superpage/icons/clear_history_bg.png + chrome/bedrockchrome/historyview.superpage/icons/button_dialog_history_clear_cancel_wait.png + chrome/bedrockchrome/historyview.superpage/icons/list_headerarrow_open.png + chrome/bedrockchrome/historyview.superpage/icons/button_dialog_history_clear_ok_wait.png + chrome/bedrockchrome/historyview.superpage/icons/list_headerarrow_closed.png + chrome/bedrockchrome/historyview.superpage/icons/list_headerbg_closed.png + chrome/bedrockchrome/historyview.superpage/icons/button_dialog_history_clear_ok_press.png + chrome/bedrockchrome/chrome.html + chrome/bedrockchrome/windowcount.snippet/windowcount.css + chrome/bedrockchrome/windowcount.snippet/windowcount.js + chrome/bedrockchrome/windowcount.snippet/icons/emptycircle.png + chrome/bedrockchrome/windowcount.snippet/icons/filledcircle.png + chrome/bedrockchrome/chrome.js + chrome/bedrockchrome/zoombar.snippet/zoombar.js + chrome/bedrockchrome/zoombar.snippet/zoombar.css + chrome/bedrockchrome/zoombar.snippet/icons/zoom_menu_bg.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom+.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom+_disabled.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom-.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom-_disabled.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom+_pressed.png + chrome/bedrockchrome/zoombar.snippet/icons/icon_zoom-_pressed.png + chrome/bedrockchrome/download.snippet/download.js + chrome/bedrockchrome/download.snippet/download.css + chrome/bedrockchrome/download.snippet/icons/download_dialog_icon.png + chrome/bedrockchrome/bookmarkview.superpage/bookmarkview.css + chrome/bedrockchrome/bookmarkview.superpage/BookmarkView.html + chrome/bedrockchrome/bookmarkview.superpage/bookmarkDialog.js + chrome/bedrockchrome/bookmarkview.superpage/bookmarkDialog.css + chrome/bedrockchrome/bookmarkview.superpage/bookmarkview.js + chrome/bedrockchrome/bookmarkview.superpage/icons/dogear.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dogear_open_bg.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_buttons_cross_pressed.png + chrome/bedrockchrome/bookmarkview.superpage/icons/cc0d0d-hatch.png + chrome/bedrockchrome/bookmarkview.superpage/icons/add_bookmark_bg.png + chrome/bedrockchrome/bookmarkview.superpage/icons/list_itembg.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dogear_pressed.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dogear_open_bg_pressed.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_buttons_cross.png + chrome/bedrockchrome/bookmarkview.superpage/icons/list_itembg_pressed.png + chrome/bedrockchrome/bookmarkview.superpage/icons/menu_icon_bookmarks.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_bottom.png + chrome/bedrockchrome/bookmarkview.superpage/icons/delete_btn.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dogear_open.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_buttons_tick_pressed.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_center.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_buttons_tick.png + chrome/bedrockchrome/bookmarkview.superpage/icons/dialog_top.png + chrome/bedrockchrome/bookmarkview.superpage/icons/edit_btn.png + chrome/bedrockchrome/suggests.snippet/suggests.css + chrome/bedrockchrome/suggests.snippet/suggests.html + chrome/bedrockchrome/suggests.snippet/icons/divider.png + chrome/bedrockchrome/suggests.snippet/icons/topshadow.png + chrome/bedrockchrome/suggests.snippet/icons/bottomshadow.png + chrome/bedrockchrome/suggests.snippet/suggests.js + chrome/bedrockchrome/statusbar.snippet/statusbar.css + chrome/bedrockchrome/statusbar.snippet/statusbar.js + chrome/bedrockchrome/statusbar.snippet/icons/download_statusbar_icon.png + chrome/bedrockchrome/statusbar.snippet/icons/lock.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt40.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt90.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt10.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt80.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt70.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt60.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt30.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt100_charging.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt20.png + chrome/bedrockchrome/statusbar.snippet/icons/battery/batt50.png + chrome/bedrockchrome/statusbar.snippet/icons/signal/signal25.png + chrome/bedrockchrome/statusbar.snippet/icons/signal/signal50.png + chrome/bedrockchrome/statusbar.snippet/icons/signal/signal0.png + chrome/bedrockchrome/statusbar.snippet/icons/signal/signal100.png + chrome/bedrockchrome/statusbar.snippet/icons/signal/signal75.png + chrome/bedrockchrome/outofmemory.snippet/outofmemorydialog.css + chrome/bedrockchrome/outofmemory.snippet/outofmemorydialog.js + chrome/bedrockchrome/outofmemory.snippet/icons/button_dialog_out_of_memory_ok_press.png + chrome/bedrockchrome/outofmemory.snippet/icons/button_dialog_out_of_memory_ok_wait.png + chrome/bedrockchrome/outofmemory.snippet/icons/icon_dialog_error.png + + diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/iconsnippet.cpp --- a/ginebra2/iconsnippet.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#include "iconsnippet.h" -#include "iconwidget.h" - -namespace GVA { - -IconSnippet::IconSnippet(const QString & elementId, ChromeWidget * chrome, QGraphicsWidget * widget, const QWebElement & element) : - ChromeSnippet(elementId, chrome, widget, element) -{ - -} -IconSnippet::~IconSnippet() -{ - -} -void IconSnippet::connectToWebpageController() -{ - static_cast(m_widget)->connectToWebpageController(); -} - -void IconSnippet::setIconForUrl(const QUrl& url) -{ - static_cast(m_widget)->setIconForUrl(url); -} - -void IconSnippet::setDefaultImage(const QImage& image) -{ - static_cast(m_widget)->setDefaultImage(image); -} -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/iconsnippet.h --- a/ginebra2/iconsnippet.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef ICONSNIPPET_H -#define ICONSNIPPET_H - -#include "ChromeSnippet.h" -#include "ChromeWidget.h" -namespace GVA { - - -class IconSnippet : public ChromeSnippet -{ - Q_OBJECT -public: - IconSnippet(const QString & elementId, ChromeWidget * chrome, QGraphicsWidget * widget, const QWebElement & element); - virtual ~IconSnippet(); - -public slots: - void connectToWebpageController(); - void setIconForUrl(const QUrl& url); - void setDefaultImage(const QImage& image); - -}; -} - -#endif // ICONSNIPPET_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/iconwidget.cpp --- a/ginebra2/iconwidget.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#include "iconwidget.h" -#include "webpagecontroller.h" -#include - -namespace GVA { - -IconWidget::IconWidget(ChromeSnippet * snippet, QGraphicsItem* parent) - : NativeChromeItem(snippet, parent) -{ - m_drawingDefault = false; - m_icon = QIcon(); - m_defaultImage = QImage(":/chrome/demochrome/Scroll.png"); - } - -void IconWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt, QWidget* widget) -{ - painter->save(); - if (m_drawingDefault) { - painter->drawImage(QRectF(0,0, geometry().width(), geometry().height()), m_defaultImage); - } - else { - if (!m_icon.isNull()) { - m_icon.paint(painter, 0, 0, geometry().width(), geometry().height()); - } - } - painter->restore(); -} - -void IconWidget::onLoadStarted() -{ - m_drawingDefault = true; - update(); -} - -void IconWidget::onIconChanged() -{ - m_drawingDefault = false; - WebPageController* pageController = WebPageController::getSingleton(); - m_icon = pageController->pageIcon(); - if (!m_icon.isNull()) { - update(); - } -} -void IconWidget::onUrlChanged(const QUrl& url) -{ - m_icon = QWebSettings::iconForUrl(url); - if (!m_icon.isNull()) { - m_drawingDefault = false; - update(); - } -} - -void IconWidget::connectToWebpageController() -{ - WebPageController* pageController = WebPageController::getSingleton(); - connect(pageController, SIGNAL(loadStarted()), this, SLOT(onLoadStarted())); - connect(pageController, SIGNAL(currentPageUrlChanged(const QUrl&)), this, SLOT(onUrlChanged(const QUrl&))); - connect(pageController, SIGNAL(currentPageIconChanged()), this, SLOT(onIconChanged())); -} - -void IconWidget::setIconForUrl(const QUrl& url) { - m_drawingDefault = false; - m_icon = QWebSettings::iconForUrl(url); - update(); -} -void IconWidget::setDefaultImage(const QImage& image) { - m_drawingDefault = true; - m_defaultImage = image; - update(); -} -}//end of name space diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/iconwidget.h --- a/ginebra2/iconwidget.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - - -#ifndef ICONWIDGET_H -#define ICONWIDGET_H - -#include "NativeChromeItem.h" -#include -#include -#include - -namespace GVA { - - class IconWidget : public NativeChromeItem - { - Q_OBJECT - - public: - IconWidget(ChromeSnippet * snippet, QGraphicsItem* parent = 0); - virtual ~IconWidget() {}; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* opt, QWidget* widget); - - public slots: - void onLoadStarted(); - void onIconChanged(); - void onUrlChanged(const QUrl& url); - void setIconForUrl(const QUrl& url); - void setDefaultImage(const QImage& image); - void connectToWebpageController(); - - private: - bool m_drawingDefault; - QImage m_defaultImage; - QIcon m_icon; - }; -} // end of namespace GVA - -#endif // ICONWIDGET_H diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/items/FamiliarItems.cpp --- a/ginebra2/items/FamiliarItems.cpp Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#include "FamiliarItems.h" -#include "../Settings.h" - -#include - -#include - -namespace GVA -{ - - FamiliarItems::FamiliarItems() - { - m_db = QSqlDatabase::database("GvaFamiliarItems"); - if(!m_db.isValid()){ - m_db = QSqlDatabase::addDatabase("QSQLITE", "GvaFamiliarItems"); - Settings * settings = Settings::instance(); - m_db.setDatabaseName(settings->installRoot() + "/familiar_items_db.sql"); - m_db.open(); - QSqlQuery q(m_db); - q.exec("create table items(url varchar(100) primary key, title varchar(40), thumbnail varchar(40), tags int)"); - } - } - - FamiliarItems::~FamiliarItems() - { - QSqlDatabase::removeDatabase("GvaFamiliarItems"); - m_db.close(); - } - - void FamiliarItems::updateItem(const FamiliarItems::Item & item) - { - QSqlQuery q(m_db); - QString qs = QString("replace into items values('%1', '%2', '%3', %4)").arg(item.url.left(100)).arg(item.title.left(40)).arg(item.thumbnail.left(40)).arg(static_cast(item.tags)); - bool ok = q.exec(qs); - qDebug() << "Query: " << qs << ": " << ok; - } - - FamiliarItems::Item FamiliarItems::item(const QString url) - { - FamiliarItems::Item item; - item.url = url; - QSqlQuery q(m_db); - q.exec(QString("select title, thumbnail, tags from items where url = '%1'").arg(url.left(100))); - q.first(); - item.title = q.value(0).toString(); - item.thumbnail = q.value(1).toString(); - item.tags = static_cast(q.value(2).toInt()); - return item; - } - - QString FamiliarItems::thumbnail(const QString url) - { - QSqlQuery q(m_db); - q.exec(QString("select thumbnail from items where url = '%1'").arg(url.left(100))); - q.first(); - QString t = q.value(0).toString(); - return t; - } - - QString FamiliarItems::title(const QString url) - { - QSqlQuery q(m_db); - QString qs = QString("select title from items where url = '%1'").arg(url.left(100)); - bool ok = q.exec(qs); - qDebug() << "Query: " << qs << " : " << ok; - q.first(); - QString t = q.value(0).toString(); - return t; - } - - FamiliarItems::ItemTag FamiliarItems::tag(const QString url) - { - QSqlQuery q(m_db); - q.exec(QString("select tags from items where url = '%1'").arg(url.left(100))); - q.first(); - int t = q.value(0).toInt(); - return static_cast(t); - } - -} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/items/FamiliarItems.h --- a/ginebra2/items/FamiliarItems.h Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef __gva_familiaritems_h__ -#define __gva_familiaritems_h__ - -#include -#include - -namespace GVA -{ - - class FamiliarItems - { - public: - - enum ItemTag{ - Bookmark = 0x01, - History = 0x02, - BackForward = 0x04, - Window = 0x08 - }; - - struct Item { - QString url; - QString title; - QString thumbnail; - ItemTag tags; - }; - - FamiliarItems(); - ~FamiliarItems(); - void updateItem(const Item &); - Item item(const QString url); - QString thumbnail(const QString url); - QString title(const QString url); - ItemTag tag(const QString url); - private: - QSqlDatabase m_db; - }; -} -#endif diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/linearflowsnippet.cpp --- a/ginebra2/linearflowsnippet.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/linearflowsnippet.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include #include #include @@ -26,17 +29,17 @@ #include #include "linearflowsnippet.h" -#define SAFE_DELETE(p) if(p) delete p; +#define SAFE_DELETE(p) if (p) delete p; #define SNIPPET_AUTOHIDE_TIMEOUT 5000 //5secs -#define CALL_ON_PREV_PREV_FILM_STRIP(func) if (d->m_centerIndex - 2 >= 0) d->m_films[d->m_centerIndex - 2]->func; else if(d->m_centerIndex == 1) d->m_films[d->m_films.size() - 1]->func; else d->m_films[d->m_films.size() - 2]->func; -#define CALL_ON_CENTER_FILM_STRIP(func) if (d->m_centerIndex >= 0 && d->m_centerIndex < d->m_films.size()) d->m_films[d->m_centerIndex]->func; else if(d->m_centerIndex < 0) d->m_films[d->m_films.size() + d->m_centerIndex]->func; else d->m_films[(d->m_centerIndex)%d->m_films.size()]->func; -#define CALL_ON_PREV_PREV_PREV_FILM_STRIP(func) if (d->m_centerIndex - 3 >= 0) d->m_films[d->m_centerIndex - 3]->func; else if(d->m_centerIndex == 1) d->m_films[d->m_films.size() - 2]->func; else if(d->m_centerIndex == 2) d->m_films[d->m_films.size() - 1]->func; else d->m_films[d->m_films.size() - 3]->func; -#define CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 3 < d->m_films.size()) d->m_films[d->m_centerIndex + 3]->func; else d->m_films[(d->m_centerIndex + 3)%d->m_films.size()]->func; -#define CALL_ON_NEXT_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 2 < d->m_films.size()) d->m_films[d->m_centerIndex + 2]->func; else d->m_films[(d->m_centerIndex + 2)%d->m_films.size()]->func; +#define CALL_ON_PREV_PREV_FILM_STRIP(func) if (d->m_centerIndex - 2 >= 0) d->m_films[d->m_centerIndex - 2]->func; else if (d->m_centerIndex == 1) d->m_films[d->m_films.size() - 1]->func; else d->m_films[d->m_films.size() - 2]->func; +#define CALL_ON_CENTER_FILM_STRIP(func) if (d->m_centerIndex >= 0 && d->m_centerIndex < d->m_films.size()) d->m_films[d->m_centerIndex]->func; else if (d->m_centerIndex < 0) d->m_films[d->m_films.size() + d->m_centerIndex]->func; else d->m_films[(d->m_centerIndex)%d->m_films.size()]->func; +#define CALL_ON_PREV_PREV_PREV_FILM_STRIP(func) if (d->m_centerIndex - 3 >= 0) d->m_films[d->m_centerIndex - 3]->func; else if (d->m_centerIndex == 1) d->m_films[d->m_films.size() - 2]->func; else if (d->m_centerIndex == 2) d->m_films[d->m_films.size() - 1]->func; else d->m_films[d->m_films.size() - 3]->func; +#define CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 3 < d->m_films.size()) d->m_films[d->m_centerIndex + 3]->func; else d->m_films[(d->m_centerIndex + 3)%d->m_films.size()]->func; +#define CALL_ON_NEXT_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 2 < d->m_films.size()) d->m_films[d->m_centerIndex + 2]->func; else d->m_films[(d->m_centerIndex + 2)%d->m_films.size()]->func; #define CALL_ON_PREV_FILM_STRIP(func) if (d->m_centerIndex - 1 >= 0) d->m_films[d->m_centerIndex - 1]->func; else d->m_films[d->m_films.size() - 1]->func; -#define CALL_ON_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 1 < d->m_films.size()) d->m_films[d->m_centerIndex + 1]->func; else d->m_films[(d->m_centerIndex + 1)%d->m_films.size()]->func; +#define CALL_ON_NEXT_FILM_STRIP(func) if (d->m_centerIndex + 1 < d->m_films.size()) d->m_films[d->m_centerIndex + 1]->func; else d->m_films[(d->m_centerIndex + 1)%d->m_films.size()]->func; #define INVALID_INDEX -1 @@ -179,7 +182,7 @@ void freeze() {m_frozen = true;} void updateMovie(FilmstripMovie* movie) {m_movie = movie; m_movieFrame = 0; m_frozen = false;} - void updateMovieFrame(int frame) { if(!m_frozen) m_movieFrame = frame;} + void updateMovieFrame(int frame) { if (!m_frozen) m_movieFrame = frame;} void setName(const QString& name) {m_name = name;} QImage& image() {return m_img;} QString& name() {return m_name;} @@ -198,7 +201,7 @@ class FilmstripFlowPrivate { public: - FilmstripFlowPrivate(): m_bgColor(QColor(99,105,115).rgb()), m_buffer(NULL), m_titleBuffer(NULL),m_closeIcon(NULL), m_centerTopSpace(0), m_sideTopSpace(0), m_space(0), m_incIndex(0), m_centerIndex(INVALID_INDEX) {} + FilmstripFlowPrivate(): m_bgColor(QColor(68,88,125).rgb()), m_buffer(NULL), m_titleBuffer(NULL),m_closeIcon(NULL), m_centerTopSpace(0), m_sideTopSpace(0), m_space(0), m_incIndex(0), m_centerIndex(INVALID_INDEX) {} ~FilmstripFlowPrivate() { for (int i = 0; i < m_films.size(); i++) @@ -257,7 +260,7 @@ if (!m_movie) return; - + QRectF target; bool needFade = (m_movie->m_movieType == FilmstripMovie::FADE_OUT); @@ -265,16 +268,16 @@ target = m_movie->movieClip(0); else target = m_movie->movieClip(m_movieFrame); - - if(target.right() > 0 || target.left() < m_filmstripFlowData->m_widgetSize.width()) { + + if (target.right() > 0 || target.left() < m_filmstripFlowData->m_widgetSize.width()) { if (needFade) painter->setOpacity((ANIMATION_MAX_FRAME - m_movieFrame) / ANIMATION_MAX_FRAME); painter->fillRect(target.adjusted(-FRAME_WIDTH,-FRAME_WIDTH,FRAME_WIDTH,FRAME_WIDTH), QColor(Qt::gray)); - - if(!m_img.isNull()) + + if (!m_img.isNull()) painter->drawImage(target, m_img); - + else { painter->save(); painter->setPen(QColor(Qt::black)); @@ -283,8 +286,8 @@ painter->restore(); } - if (needFade) - painter->setOpacity(1); // restore opacity + if (needFade) + painter->setOpacity(1); // restore opacity } } @@ -322,7 +325,7 @@ // ------------------------------------------------------- // FilmstripMovieFactory -FilmstripMovieFactory::~FilmstripMovieFactory() +FilmstripMovieFactory::~FilmstripMovieFactory() { QHashIterator i(m_moviesCache); while (i.hasNext()) { @@ -368,7 +371,7 @@ createRightRightInMovie(movie); else if (name == BreakoutLeftLeft) createLeftLeftOutMovie(movie); - else if (name == BreakoutRightRight) + else if (name == BreakoutRightRight) createRightRightOutMovie(movie); else if (name == LeftLeftToLeft) createLeftLeftToLeftMovie(movie); @@ -376,7 +379,7 @@ createLeftToLeftLeftMovie(movie); else if (name == RightToRightRight) createRightToRightRightMovie(movie); - else if(name == RightRightToRight) + else if (name == RightRightToRight) createRightRightToRightMovie(movie); m_moviesCache[name] = movie; @@ -386,7 +389,7 @@ return movie; } -void FilmstripMovieFactory::createLeftLeftInMovie(FilmstripMovie* movie) +void FilmstripMovieFactory::createLeftLeftInMovie(FilmstripMovie* movie) { movie->m_movieClips.clear(); int cw = m_filmstripFlowData->m_centerWindowSize.width(); @@ -395,8 +398,8 @@ int w = m_filmstripFlowData->m_widgetSize.width(); int h = m_filmstripFlowData->m_widgetSize.height(); - qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; - qreal sx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - 2 * sw; + qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; + qreal sx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - 2 * sw; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / ANIMATION_MAX_FRAME; @@ -416,7 +419,7 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal cx = (w + 4 * m_filmstripFlowData->m_space + cw) / 2.0 - m_filmstripFlowData->m_space; - qreal sx = ((w + 4 * m_filmstripFlowData->m_space + cw) / 2.0) + sw ; + qreal sx = ((w + 4 * m_filmstripFlowData->m_space + cw) / 2.0) + sw ; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / ANIMATION_MAX_FRAME; @@ -435,8 +438,8 @@ int w = m_filmstripFlowData->m_widgetSize.width(); int h = m_filmstripFlowData->m_widgetSize.height(); - qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; - qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); + qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; + qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx -cx) / ANIMATION_MAX_FRAME; @@ -456,7 +459,7 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal cx = (w + 4 * m_filmstripFlowData->m_space + cw) / 2.0 - m_filmstripFlowData->m_space; - qreal sx = ((w + 4 * m_filmstripFlowData->m_space + cw) / 2.0) + sw ; + qreal sx = ((w + 4 * m_filmstripFlowData->m_space + cw) / 2.0) + sw ; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx - cx) / ANIMATION_MAX_FRAME; @@ -476,15 +479,15 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal step = ANIMATION_MAX_FRAME; - qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; + qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); + qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / step; qreal stepy = (cy - sy) / step; qreal stepx2 = stepx + (cw - sw) / step; qreal stepy2 = stepy + (ch - sh) / step; - + QRectF startRect = QRectF(sx, sy, sw, sh); QRectF endRect = QRectF(cx, cy, cw, ch); @@ -502,15 +505,15 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal step = ANIMATION_MAX_FRAME; - qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; + qreal cx = ((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw + m_filmstripFlowData->m_space; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); + qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - (2 *sw); qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx - cx) / step; qreal stepy = (sy - cy) / step; qreal stepx2 = stepx + (sw - cw) / step; qreal stepy2 = stepy + (sh - ch) / step; - + QRectF startRect = QRectF(cx, cy, cw, ch); QRectF endRect = QRectF(sx, sy, sw, sh); addRectByFrame(movie, startRect, endRect, stepx, stepy, stepx2, stepy2); @@ -529,17 +532,17 @@ qreal step = ANIMATION_MAX_FRAME; qreal cx = (w + 4 * m_filmstripFlowData->m_space + cw) / 2.0 - m_filmstripFlowData->m_space; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = (((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0) + sw; + qreal sx = (((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0) + sw; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx - cx) / step; qreal stepy = (sy - cy) / step; qreal stepx2 = stepx + (sw - cw) / step; qreal stepy2 = stepy + (sh - ch) / step; - + QRectF startRect = QRectF(cx, cy, cw, ch); QRectF endRect = QRectF(sx, sy, sw, sh); addRectByFrame(movie, startRect, endRect, stepx, stepy, stepx2, stepy2); - + } void FilmstripMovieFactory::createRightRightToRightMovie(FilmstripMovie* movie) @@ -555,13 +558,13 @@ qreal step = ANIMATION_MAX_FRAME; qreal cx = (w + 4 * m_filmstripFlowData->m_space + cw) / 2.0 - m_filmstripFlowData->m_space; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = ((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0 + sw; + qreal sx = ((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0 + sw; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / step; qreal stepy = (cy - sy) / step; qreal stepx2 = stepx + (cw - sw) / step; qreal stepy2 = stepy + (ch - sh) / step; - + QRectF startRect = QRectF(sx, sy, sw, sh); QRectF endRect = QRectF(cx, cy, cw, ch); @@ -572,16 +575,10 @@ void FilmstripMovieFactory::addRectByFrame(FilmstripMovie* movie, QRectF& startRect, QRectF& endRect, qreal x1, qreal y1, qreal x2, qreal y2, bool debug) { movie->m_movieClips.append(startRect); - if (debug) - qDebug() << "0:" << startRect; for (int i = 1; i < ANIMATION_MAX_FRAME; i++) { - if (debug) - qDebug() << i << ":" << movie->m_movieClips[i - 1].adjusted(x1, y1, x2, y2); movie->m_movieClips.append(movie->m_movieClips[i - 1].adjusted(x1, y1, x2, y2)); } movie->m_movieClips.append(endRect); - if (debug) - qDebug() << movie->m_movieClips.size() - 1 << ":" << endRect; } void FilmstripMovieFactory::createLeftToCenterMovie(FilmstripMovie* movie) @@ -623,7 +620,7 @@ qreal step = ANIMATION_MAX_FRAME; qreal cx = (w - cw) / 2.0; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = ((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0 - m_filmstripFlowData->m_space; + qreal sx = ((w + 4 * m_filmstripFlowData->m_space) + cw) / 2.0 - m_filmstripFlowData->m_space; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / step; qreal stepy = (cy - sy) / step; @@ -649,7 +646,7 @@ qreal step = ANIMATION_MAX_FRAME; qreal cx = (w - cw) / 2.0; qreal cy = m_filmstripFlowData->m_centerTopSpace; - qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - sw + m_filmstripFlowData->m_space; + qreal sx = (((w - 4 * m_filmstripFlowData->m_space) - cw) / 2.0) - sw + m_filmstripFlowData->m_space; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx - cx) / step; qreal stepy = (sy - cy) / step; @@ -699,7 +696,7 @@ qreal sx = (w * (1 - 2 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx -cx) / ANIMATION_MAX_FRAME; - + QRectF startRect = QRectF(sx, sy, sw, sh); QRectF endRect = QRectF(2 * sx - cx , sy, sw, sh); @@ -716,10 +713,10 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal cx = (w - cw) / 2.0; - qreal sx = (w * (1 - 2 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw; + qreal sx = (w * (1 - 2 * m_filmstripFlowData->m_space) - cw) / 2.0 - sw; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / ANIMATION_MAX_FRAME; - + QRectF startRect = QRectF(2 * sx - cx , sy, sw, sh); QRectF endRect = QRectF(sx, sy, sw, sh); @@ -736,7 +733,7 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal cx = (w - cw) / 2.0; - qreal sx = (w * (1 + 2 * m_filmstripFlowData->m_space) + cw) / 2.0; + qreal sx = (w * (1 + 2 * m_filmstripFlowData->m_space) + cw) / 2.0; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (sx - cx) / ANIMATION_MAX_FRAME; @@ -755,7 +752,7 @@ int h = m_filmstripFlowData->m_widgetSize.height(); qreal cx = (w - cw) / 2.0; - qreal sx = (w * (1 + 2 * m_filmstripFlowData->m_space) + cw) / 2.0; + qreal sx = (w * (1 + 2 * m_filmstripFlowData->m_space) + cw) / 2.0; qreal sy = m_filmstripFlowData->m_sideTopSpace; qreal stepx = (cx - sx) / ANIMATION_MAX_FRAME; @@ -777,7 +774,7 @@ QRectF startRect = QRectF(cx, cy, cw, ch); movie->m_movieClips.append(startRect); - + movie->m_movieType = FilmstripMovie::FADE_OUT; } @@ -797,7 +794,7 @@ qreal stepy = - cy / step; qreal stepx2 = - stepx; qreal stepy2 = (h - cy - ch) / step; - + QRectF startRect = QRectF(cx, cy, cw, ch); QRectF endRect = QRectF(0, 0, w, h); @@ -884,43 +881,43 @@ createLeftLeftInMovie(movie); } - + i = m_moviesCache.find(BreakinRightRight); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(BreakinRightRight); createRightRightInMovie(movie); } - + i = m_moviesCache.find(BreakoutLeftLeft); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(BreakoutLeftLeft); createLeftLeftOutMovie(movie); } - + i = m_moviesCache.find(BreakoutRightRight); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(BreakoutRightRight); createRightRightOutMovie(movie); } - + i = m_moviesCache.find(LeftLeftToLeft); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(LeftLeftToLeft); createLeftLeftToLeftMovie(movie); - } - + } + i = m_moviesCache.find(LeftToLeftLeft); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(LeftToLeftLeft); createLeftToLeftLeftMovie(movie); - } - + } + i = m_moviesCache.find(RightToRightRight); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(RightToRightRight); createRightToRightRightMovie(movie); - } - + } + i = m_moviesCache.find(RightRightToRight); if (i != m_moviesCache.end()) { FilmstripMovie* movie = m_moviesCache.value(RightRightToRight); @@ -932,8 +929,8 @@ // LinearFlowSnippet. /*! Creates a new LinearFlowSnippet. -*/ -LinearFlowSnippet::LinearFlowSnippet(QGraphicsWidget* parent): QGraphicsWidget(parent), d(new FilmstripFlowPrivate()) +*/ +LinearFlowSnippet::LinearFlowSnippet(QGraphicsWidget* parent): ChromeItem(NULL, parent), d(new FilmstripFlowPrivate()) { setParent(parent); m_scrolled = false; @@ -987,29 +984,29 @@ /*! Set center index */ -void LinearFlowSnippet::setCenterIndex(int i) +void LinearFlowSnippet::setCenterIndex(int i) { Q_ASSERT(d); if (!d->m_films.size()) return; - - if(d->m_centerIndex == i) + + if (d->m_centerIndex == i) return; - if(i < 0) + if (i < 0) i = (d->m_films.size() + i); - else if(d->m_centerIndex >= d->m_films.size() - 1) + else if (d->m_centerIndex >= d->m_films.size() - 1) i = i % d->m_films.size(); d->m_centerIndex = i; - + CALL_ON_PREV_PREV_PREV_FILM_STRIP(updateMovie(NULL)); CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(updateMovie(NULL)); d->m_films[d->m_centerIndex]->updateMovie(d->m_movieFactory.createMovie(CenterToRight)); CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftToCenter))); - CALL_ON_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftLeftToLeft))); + CALL_ON_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftLeftToLeft))); CALL_ON_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(RightToRightRight))); - CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutRightRight))); + CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutRightRight))); emit centerIndexChanged(i); } @@ -1037,7 +1034,7 @@ /*! Inserts filmstrip at index position i. - If i is 0, the filmstrip is prepended to the film list. + If i is 0, the filmstrip is prepended to the film list. If i is size(), the value is appended to the film list. */ void LinearFlowSnippet::insert(int i, const QImage& image, const QString& title) @@ -1048,7 +1045,7 @@ Filmstrip* filmstrip = new Filmstrip(image, d); filmstrip->setName(title); d->m_films.insert(i, filmstrip); - + if (isVisible()) { Q_ASSERT(d->m_movieTimer.state() != QTimeLine::Running); if (i == d->m_centerIndex + 1) // insert on right @@ -1072,7 +1069,7 @@ if (d->m_movieTimer.state() == QTimeLine::Running) return; - d->m_films[d->m_centerIndex]->updateMovie(d->m_movieFactory.createMovie(FadeOut)); // move center slide to left + d->m_films[d->m_centerIndex]->updateMovie(d->m_movieFactory.createMovie(FadeOut)); // move center slide to left CALL_ON_PREV_FILM_STRIP(freeze()); // no movement for left slide CALL_ON_NEXT_FILM_STRIP(freeze()); // no movement for right slide @@ -1091,7 +1088,7 @@ /*! Return the index of the current center slide */ -int LinearFlowSnippet::centerIndex() const +int LinearFlowSnippet::centerIndex() const { Q_ASSERT(d); return d->m_centerIndex; @@ -1099,7 +1096,7 @@ /*! Clear all slides */ -void LinearFlowSnippet::clear() +void LinearFlowSnippet::clear() { Q_ASSERT(d); d->clear(); @@ -1111,7 +1108,7 @@ d->m_bgColor = c; } -int LinearFlowSnippet::slideCount() const +int LinearFlowSnippet::slideCount() const { return d ? d->m_films.size() : 0; } @@ -1125,14 +1122,14 @@ } //! return true if slide animation is ongoing -bool LinearFlowSnippet::slideAnimationOngoing() const +bool LinearFlowSnippet::slideAnimationOngoing() const { Q_ASSERT(d); return d->m_movieTimer.state() == QTimeLine::Running; } //! return center slide's rect -QRect LinearFlowSnippet::centralRect() const +QRect LinearFlowSnippet::centralRect() const { Q_ASSERT(d); int cw = d->m_centerWindowSize.width(); @@ -1148,9 +1145,9 @@ //! prepare start-animation void LinearFlowSnippet::prepareStartAnimation() { - CALL_ON_PREV_PREV_PREV_FILM_STRIP(updateMovie(NULL)); - CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(updateMovie(NULL)); - CALL_ON_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakinLeftLeft))); + CALL_ON_PREV_PREV_PREV_FILM_STRIP(updateMovie(NULL)); + CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(updateMovie(NULL)); + CALL_ON_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakinLeftLeft))); CALL_ON_CENTER_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftToCenter))); CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakinRightRight))); CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftLeftToLeft))); @@ -1172,13 +1169,13 @@ Q_ASSERT(d); if (d->m_movieTimer.state() == QTimeLine::Running) return; - + CALL_ON_PREV_PREV_PREV_FILM_STRIP(freeze()); CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(freeze()); CALL_ON_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutLeftLeft))); CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftToLeftLeft))); CALL_ON_CENTER_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(CenterToLeft))); - CALL_ON_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(RightToRightRight))); + CALL_ON_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(RightToRightRight))); CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutRightRight))); QObject::disconnect(&d->m_movieTimer, SIGNAL(finished()), this, SLOT(stopMovie())); @@ -1207,7 +1204,7 @@ SAFE_DELETE(d->m_titleBuffer); int w = s.width(); int h = s.height() * FILM_HEIGHT; - + qreal ix; qreal ratio = ((qreal) w) / h; @@ -1219,18 +1216,18 @@ QFont font; font.setBold(true); - font.setPixelSize(13); + font.setPixelSize(20); font.setWeight(QFont::Bold); - painter.setPen(QColor(169,169,169)); + painter.setPen(QColor(255,255,255)); painter.setFont(font); - painter.drawText(QPointF(0,s.height() * TITLE_HEIGHT - 3),m_titleName); + painter.drawText(QPointF(3,s.height() * TITLE_HEIGHT),m_titleName); d->m_sideWindowSize = QSize(WIDTH * L_SIDE_WIDTH_P_C, h * L_SIDE_HEIGHT_P_C); d->m_centerWindowSize = QSize(WIDTH * L_CENTER_WIDTH_P_C, h * L_CENTER_HEIGHT_P_C); d->m_centerTopSpace = h * L_CENTER_TOP_SPACE_P_C; d->m_sideTopSpace = h * L_SIDE_TOP_SPACE_P_C ; - - if( m_displayMode == "Portrait") { + + if ( m_displayMode == "Portrait") { d->m_space = ((qreal)w - ( P_MAX_SLIDE - 1) * (qreal)d->m_sideWindowSize.width() - (qreal)d->m_centerWindowSize.width())/(P_MAX_SLIDE + 1); } else { @@ -1245,39 +1242,38 @@ } d->m_movieFactory.updateAllMovie(); - if(d->m_centerIndex != -1) { - if(m_displayMode == "Portrait") + if (d->m_centerIndex != -1) { + if (m_displayMode == "Portrait") setCenterIndex(d->m_centerIndex - 1); else setCenterIndex(d->m_centerIndex + 1); } } -//! insert a new filmstrip on current's right +//! insert a new filmstrip on current's right void LinearFlowSnippet::showInsertOnRight() { Q_ASSERT(d); d->m_incIndex = 1; d->m_films[d->m_centerIndex]->updateMovie(d->m_movieFactory.createMovie(CenterToLeft)); // move center slide to left - + CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutLeft))); // move left slide out CALL_ON_NEXT_NEXT_FILM_STRIP(freeze());// no movement for right slide d->m_movieTimer.start(); } -//! insert a new filmstrip on current's right +//! insert a new filmstrip on current's right void LinearFlowSnippet::showInsertOnLeft() { //FIXME Q_ASSERT(d); - qDebug() << "showInsertOnLeft is not implemented."; } -//! Show the previous item +//! Show the previous item void LinearFlowSnippet::showPrevious() { Q_ASSERT(d); - + d->m_incIndex = -1; CALL_ON_CENTER_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(CenterToRight))); CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftToCenter))); @@ -1287,7 +1283,7 @@ CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakoutRightRight))); CALL_ON_PREV_PREV_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakinLeftLeft))); - + d->m_movieTimer.start(); } @@ -1295,7 +1291,7 @@ void LinearFlowSnippet::showNext() { Q_ASSERT(d); - + d->m_incIndex = 1; CALL_ON_CENTER_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(CenterToLeft))); CALL_ON_PREV_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(LeftToLeftLeft))); @@ -1309,10 +1305,10 @@ void LinearFlowSnippet::scroll() { - if(d->m_movieTimer.state() == QTimeLine::Running) + if (d->m_movieTimer.state() == QTimeLine::Running) return; - - if(d->m_lastMoveEventPos.x() < (size().width() - d->m_centerWindowSize.width())/ 2) { + + if (d->m_lastMoveEventPos.x() < (size().width() - d->m_centerWindowSize.width())/ 2) { showPrevious(); } else if (d->m_lastMoveEventPos.x() > (size().width() + d->m_centerWindowSize.width())/ 2) { @@ -1348,10 +1344,10 @@ if (newIndex >= 0 && newIndex < d->m_films.size()) setCenterIndex(newIndex); - + update(); - if(m_countFlicks) { + if (m_countFlicks) { startFlickScroll(); } } @@ -1360,8 +1356,8 @@ { Filmstrip* f = d->m_films.at(d->m_centerIndex); - if (d->m_centerIndex == 0) { - d->m_incIndex = 0; + if (d->m_centerIndex == 0) { + d->m_incIndex = 0; CALL_ON_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(RightToCenter))); CALL_ON_NEXT_NEXT_FILM_STRIP(updateMovie(d->m_movieFactory.createMovie(BreakinRight))); d->m_films.removeAt(d->m_centerIndex); @@ -1387,7 +1383,7 @@ { if (!d->m_closeIcon) return false; - + int iw = d->m_closeIcon->size().width() / 2; QPoint p = d->m_lastMoveEventPos - (d->m_closeIconPos + QPoint(iw, iw)); return (p.manhattanLength() < iw + CLOSE_ICON_ADJUST_SIZE) ? true : false; @@ -1407,18 +1403,18 @@ void LinearFlowSnippet::mouseMoveEvent(QGraphicsSceneMouseEvent* event) { - //qDebug() << "!!!!!!!!!!!!!!!!move event" << this->size(); - if( qAbs(qAbs(event->pos().toPoint().x()) - qAbs(d->m_lastMoveEventPos.x())) > 20) + //qDebug() << "!!!!!!!!!!!!!!!!move event" << this->size(); + if ( qAbs(qAbs(event->pos().toPoint().x()) - qAbs(d->m_lastMoveEventPos.x())) > 20) { - if( event->pos().toPoint().x() < event->lastPos().toPoint().x()) + if ( event->pos().toPoint().x() < event->lastPos().toPoint().x()) showNext(); else showPrevious(); d->m_lastMoveEventPos = event->pos().toPoint(); QTime now(QTime::currentTime()); - m_lastMoveEventTime.setHMS(now.hour(),now.minute(), now.second(), now.msec()); - + m_lastMoveEventTime.setHMS(now.hour(),now.minute(), now.second(), now.msec()); + DragPoint dragPoint; dragPoint.iPoint = d->m_lastMoveEventPos; dragPoint.iTime = QTime::currentTime(); @@ -1426,25 +1422,25 @@ while (m_dragPoints.size() > 4) m_dragPoints.removeFirst(); - + m_scrolled= true; } } -bool LinearFlowSnippet::isFlick() +bool LinearFlowSnippet::isFlick() { bool flick = false; QPoint moveSpeed = speed(); int xSpeed = moveSpeed.x(); int ySpeed = moveSpeed.y(); - - flick = (qAbs(xSpeed) > THRESHOLD_FLICK_SPEED || + + flick = (qAbs(xSpeed) > THRESHOLD_FLICK_SPEED || qAbs(ySpeed) > THRESHOLD_FLICK_SPEED); - + return flick; } -QPoint LinearFlowSnippet::speed() +QPoint LinearFlowSnippet::speed() { // Speed is only evaluated at the end of the swipe QPoint dragSpeed(0,0); @@ -1469,7 +1465,7 @@ qreal LinearFlowSnippet::dragTime() const { - if(m_dragPoints.isEmpty()) + if (m_dragPoints.isEmpty()) return 0.0; else return m_dragPoints[0].iTime.msecsTo(m_dragPoints[m_dragPoints.size()-1].iTime); @@ -1492,7 +1488,7 @@ void LinearFlowSnippet::mousePressEvent(QGraphicsSceneMouseEvent* event) { emit mouseEvent( event->type()); - if(m_countFlicks) + if (m_countFlicks) m_countFlicks = 0; d->m_movieTimer.setDuration(ANIMATION_DURATION); m_dragPoints.clear(); @@ -1500,16 +1496,16 @@ dragPoint.iPoint = event->pos().toPoint(); dragPoint.iTime = QTime::currentTime(); m_dragPoints.append(dragPoint); - m_scrolled = false; + m_scrolled = false; m_lastMoveEventTime.setHMS(0,0,0,0); d->m_lastMoveEventPos = event->pos().toPoint(); } void LinearFlowSnippet::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) -{ +{ emit mouseEvent( event->type()); //check whether strip is scrolled - if(!m_scrolled) { + if (!m_scrolled) { QPoint releasePoint = event->pos().toPoint(); int cw = d->m_centerWindowSize.width(); @@ -1527,15 +1523,15 @@ int pageIndex; //check for leftleft film - if((releasePoint.x() >= leftLeftPageX) && (releasePoint.x() <= (leftLeftPageX + sw)) && + if ((releasePoint.x() >= leftLeftPageX) && (releasePoint.x() <= (leftLeftPageX + sw)) && (releasePoint.y() >= (d->m_sideTopSpace+ d->m_widgetSize.height() * TITLE_HEIGHT)) && (releasePoint.y() <= (d->m_sideTopSpace + sh + d->m_widgetSize.height() * TITLE_HEIGHT))) { pageIndex = d->m_centerIndex - 2; } - + //check for left film - else if((releasePoint.x() >= leftPageX) && (releasePoint.x() <= (leftPageX + sw)) && + else if ((releasePoint.x() >= leftPageX) && (releasePoint.x() <= (leftPageX + sw)) && (releasePoint.y() >= (d->m_sideTopSpace+ d->m_widgetSize.height() * TITLE_HEIGHT)) && (releasePoint.y() <= (d->m_sideTopSpace + sh + d->m_widgetSize.height() * TITLE_HEIGHT))) { pageIndex = d->m_centerIndex - 1; @@ -1543,19 +1539,19 @@ } //check for center film - else if((releasePoint.x() >= centerPageX) && (releasePoint.x() <= (centerPageX + cw)) && + else if ((releasePoint.x() >= centerPageX) && (releasePoint.x() <= (centerPageX + cw)) && (releasePoint.y() >= (d->m_centerTopSpace+ d->m_widgetSize.height() * TITLE_HEIGHT)) && (releasePoint.y() <= (d->m_centerTopSpace + ch + d->m_widgetSize.height() * TITLE_HEIGHT))) { pageIndex = d->m_centerIndex; } //check for right film - else if((releasePoint.x() >= rightPageX) && (releasePoint.x() <= (rightPageX + sw)) && + else if ((releasePoint.x() >= rightPageX) && (releasePoint.x() <= (rightPageX + sw)) && (releasePoint.y() >= (d->m_sideTopSpace+ d->m_widgetSize.height() * TITLE_HEIGHT)) && (releasePoint.y() <= (d->m_sideTopSpace + sh + d->m_widgetSize.height() * TITLE_HEIGHT))) { pageIndex = d->m_centerIndex + 1; } //check for right right film - else if((releasePoint.x() >= rightRightPageX) && (releasePoint.x() <= (rightRightPageX + sw)) && + else if ((releasePoint.x() >= rightRightPageX) && (releasePoint.x() <= (rightRightPageX + sw)) && (releasePoint.y() >= (d->m_sideTopSpace+ d->m_widgetSize.height() * TITLE_HEIGHT)) && (releasePoint.y() <= (d->m_sideTopSpace + sh + d->m_widgetSize.height() * TITLE_HEIGHT))) { pageIndex = d->m_centerIndex + 2; } @@ -1564,14 +1560,14 @@ else { return; } - if( pageIndex < 0) + if ( pageIndex < 0) pageIndex = d->m_films.size() + pageIndex; else if (pageIndex >= d->m_films.size()) pageIndex = (pageIndex) % d->m_films.size(); emit ok(pageIndex); } - + else { int msecs = 0; if (!m_lastMoveEventTime.isNull()) { @@ -1580,8 +1576,8 @@ msecs = m_lastMoveEventTime.msecsTo(now); m_lastMoveEventTime.setHMS(0,0,0,0); } - if((msecs>0) && (msecs < THRESHOLD_FLICK_TIME)) { - if( isFlick()) { + if ((msecs>0) && (msecs < THRESHOLD_FLICK_TIME)) { + if ( isFlick()) { m_countFlicks = qBound (-MAX_FLICK_SPEED,speed().x(),+MAX_FLICK_SPEED)/((m_displayMode == "portrait") ? 200 : 100); startFlickScroll(); } @@ -1590,9 +1586,9 @@ } void LinearFlowSnippet::startFlickScroll() -{ +{ d->m_movieTimer.setDuration(qAbs(ANIMATION_DURATION / m_countFlicks)); - if(m_countFlicks < 0) { + if (m_countFlicks < 0) { showNext(); m_countFlicks++; } @@ -1613,7 +1609,7 @@ d->m_buffer->fill(d->m_bgColor); if (d->m_films.size() > 0 && d->m_centerIndex != INVALID_INDEX) { - + QPainter bufPaint(d->m_buffer); // draw center film strip CALL_ON_CENTER_FILM_STRIP(paint(&bufPaint)); @@ -1632,7 +1628,7 @@ // draw right right film strip CALL_ON_NEXT_NEXT_FILM_STRIP(paint(&bufPaint)); - + // draw right right film strip CALL_ON_NEXT_NEXT_NEXT_FILM_STRIP(paint(&bufPaint)); @@ -1644,7 +1640,7 @@ painter->drawImage(d->m_closeIconPos, *(d->m_closeIcon)); } } - else + else painter->drawImage(QPoint(0,d->m_widgetSize.height() * TITLE_HEIGHT), *(d->m_buffer)); } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/linearflowsnippet.h --- a/ginebra2/linearflowsnippet.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/linearflowsnippet.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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 LINEARFLOWSNIPPET_H #define LINEARFLOWSNIPPET_H @@ -24,6 +27,7 @@ #include #include #include +#include "ChromeItem.h" class DragPoint { @@ -40,8 +44,8 @@ /*! Class GraphicsFilmstripFlow - */ -class LinearFlowSnippet: public QGraphicsWidget + */ +class LinearFlowSnippet: public ChromeItem { Q_OBJECT friend class Filmstrip; @@ -50,7 +54,7 @@ public: /*! Creates a new FilmstripFlow widget. - */ + */ LinearFlowSnippet(QGraphicsWidget* parent = 0); /*! @@ -65,7 +69,7 @@ //! Clear all slides void clear(); - + //! Add a slide to the flow void addSlide(const QImage& image); @@ -75,7 +79,7 @@ //! Set the center of the flow void setCenterIndex(int i); - //! Show the previous item + //! Show the previous item void showPrevious(); //! Show the next item @@ -99,7 +103,7 @@ //! show the ith slide void showSlide(int) {} - //! inserts filmstrip at index position i. + //! inserts filmstrip at index position i. void insert(int i, const QImage& image, const QString& title); //! removes filmstrip at index position i. @@ -116,18 +120,18 @@ //! run start-animation void runStartAnimation(); - + //! run end-animation void runEndAnimation(); bool isFlick(); - + QPoint speed(); - + QPoint currentPos(); - + QPoint previousPos(); - + qreal dragTime() const; void startFlickScroll(); @@ -138,10 +142,9 @@ void centerIndexChanged(int index); void ok(int index); void cancel(); - void mouseEvent(QEvent::Type type); protected: - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); - void resizeEvent(QGraphicsSceneResizeEvent* event); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0); + void resizeEvent(QGraphicsSceneResizeEvent* event); void moveEvent(QGraphicsSceneMoveEvent* event); void mouseMoveEvent(QGraphicsSceneMouseEvent* event); void mousePressEvent(QGraphicsSceneMouseEvent* event); @@ -152,7 +155,7 @@ void stopMovie(); void playMovie(int frame); void closeAnimation(); - + private: void scroll(); void adjustFilmstripSize(QSize& s); diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/localpages/da-vinci-ginevra-de_benci-icon.jpg Binary file ginebra2/localpages/da-vinci-ginevra-de_benci-icon.jpg has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/localpages/da-vinci-ginevra-de_benci.jpg Binary file ginebra2/localpages/da-vinci-ginevra-de_benci.jpg has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/localpages/static.html --- a/ginebra2/localpages/static.html Fri May 14 15:40:36 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ - - -Ginebra 2 Home: This page has a very long title that should no wrap or overwrite other chrome. Lets see . - - -

Ginebra 2 Test Page

- -

Here's the Qt 4.6 Documentation -
Here's Google News -
Here's Secure Page -
Here's a bad web page -

- - diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/mostvisitedpageview.cpp --- a/ginebra2/mostvisitedpageview.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/mostvisitedpageview.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include #include "mostvisitedpagestore.h" @@ -23,22 +26,24 @@ #include "mostvisitedpageview.h" #include "webpagecontroller.h" #include "BookmarksManager.h" +#include "webpagedata.h" const int KLinearSnippetHeight = 120; namespace GVA { -MostVisitedPagesWidget::MostVisitedPagesWidget(ChromeSnippet* snippet,QGraphicsWidget* parent) - : m_snippet(snippet) - , QGraphicsWidget(parent) - , m_parent(parent) - , m_flowInterface(0) - , m_hideOnClose(true) +MostVisitedPagesWidget::MostVisitedPagesWidget(ChromeSnippet* snippet, ChromeWidget* chrome) + : ChromeItem(snippet, chrome->layout()) + , m_parent(chrome->layout()) + , m_chrome(chrome) + , m_flowInterface(0) + , m_hideOnClose(true) { setFlags(QGraphicsItem::ItemDoesntPropagateOpacityToChildren); setOpacity(0.5); m_mostVisitedPageStore = new MostVisitedPageStore(); WebPageController* pageController = WebPageController::getSingleton(); - bool ret = connect(pageController, SIGNAL(loadFinished(const bool)), this, SLOT(onLoadFinished(const bool))); + connect(pageController, SIGNAL(loadFinished(const bool)), this, SLOT(onLoadFinished(const bool))); + connect(WRT::BookmarksManager::getSingleton(),SIGNAL(historyCleared()),this,SLOT(clearMVStore())); } MostVisitedPagesWidget::~MostVisitedPagesWidget() @@ -48,7 +53,8 @@ if (m_mostVisitedPageStore) delete m_mostVisitedPageStore; WebPageController* pageController = WebPageController::getSingleton(); - disconnect(pageController, SIGNAL(loadFinished()), this, SLOT(onLoadFinished())); + disconnect(pageController, SIGNAL(loadFinished(const bool)), this, SLOT(onLoadFinished(const bool))); + disconnect(WRT::BookmarksManager::getSingleton(),SIGNAL(historyCleared()),this,SLOT(clearMVStore())); } @@ -60,20 +66,20 @@ m_flowInterface = new GVA::LinearFlowSnippet(this); m_flowInterface->setZValue(m_parent->zValue() + 1); m_flowInterface->resize(QSize(m_parent->size().width(), KLinearSnippetHeight)); - connect(m_flowInterface, SIGNAL(mouseEvent(QEvent::Type)),this->m_snippet,SIGNAL(snippetMouseEvent(QEvent::Type))); - + connect(m_flowInterface, SIGNAL(mouseEvent(QEvent::Type)),this,SIGNAL(mouseEvent(QEvent::Type))); + //Initialize the page selection index m_selectIndex = -1; - + QString displayMode; if (m_parent->size().width() > m_parent->size().height()) { displayMode = "Landscape"; - + } else { displayMode = "Portrait"; } - m_flowInterface->init(displayMode,"Most Visited Pages"); + m_flowInterface->init(displayMode,qtTrId("txt_browser_most_visited_title")); MostVisitedPageList mvPageList = m_mostVisitedPageStore->pageList(); @@ -90,7 +96,7 @@ delete pageThumbnail; } } - + setCenterIndex(displayMode); m_flowInterface->prepareStartAnimation(); m_flowInterface->runStartAnimation(); @@ -111,7 +117,7 @@ void MostVisitedPagesWidget::updatePos(QPointF pos, qreal &toolBarHeight) { QGraphicsWidget::setPos(pos); - m_flowInterface->setPos(pos.x(), m_parent->size().height() - toolBarHeight - KLinearSnippetHeight); + m_flowInterface->setPos(pos.x(), m_parent->size().height() - (toolBarHeight+5) - KLinearSnippetHeight); } void MostVisitedPagesWidget::resize(const QSize &size) @@ -122,12 +128,12 @@ void MostVisitedPagesWidget::displayModeChanged(QString& newMode) { - m_flowInterface->displayModeChanged(newMode); + m_flowInterface->displayModeChanged(newMode); } void MostVisitedPagesWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - painter->fillRect(0, 0, size().width(), size().height(), QColor(107, 109, 107)); + painter->fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); QGraphicsWidget::paint(painter, option, widget); } @@ -146,7 +152,7 @@ { Q_ASSERT(m_flowInterface); m_selectIndex = index; - close(); + close(); } void MostVisitedPagesWidget::closeAnimationCompleted() @@ -157,14 +163,14 @@ QGraphicsWidget::hide(); disconnect(m_flowInterface, SIGNAL(ok(int)), this, SLOT(okTriggered(int))); disconnect(m_flowInterface, SIGNAL(endAnimationCplt()), this, SLOT(closeAnimationCompleted())); - disconnect(m_flowInterface, SIGNAL(mouseEvent(QEvent::Type)),this->m_snippet,SIGNAL(snippetMouseEvent(QEvent::Type))); + disconnect(m_flowInterface, SIGNAL(mouseEvent(QEvent::Type)),this,SIGNAL(mouseEvent(QEvent::Type))); m_flowInterface->removeEventFilter(this); m_flowInterface->deleteLater(); m_flowInterface = NULL; - + if (m_selectIndex != -1) - static_cast(m_parent)->loadUrlToCurrentPage(m_mostVisitedPageStore->pageAt(m_selectIndex)->pageUrl()); + m_chrome->loadUrlToCurrentPage(m_mostVisitedPageStore->pageAt(m_selectIndex)->pageUrl()); if (m_snippet->isVisible() && m_hideOnClose) m_snippet->ChromeSnippet::toggleVisibility(); @@ -177,32 +183,27 @@ { qreal toolBarHeight; - ChromeSnippet* visibleSnippet= static_cast(m_parent)->getSnippet("WebViewToolbarId"); + ChromeSnippet* visibleSnippet= m_chrome->getSnippet("WebViewToolbarId"); if (visibleSnippet) - toolBarHeight = visibleSnippet->widget()->geometry().height(); + toolBarHeight = visibleSnippet->widget()->geometry().height(); resize(m_parent->size().toSize()); updatePos(QPointF(0, 0), toolBarHeight); } - void MostVisitedPagesWidget::updateMVStore(QWebPage *page) + void MostVisitedPagesWidget::updateMVStore(WRT::WrtBrowserContainer *page) { Q_ASSERT(page); Q_ASSERT(!page->mainFrame()->url().isEmpty()); - QImage* pageThumbnail = 0; QUrl pageUrl = page->mainFrame()->url(); int pageRank = 0; - - //check if page exits in store along with its thumbnail + QImage* pageThumbnail = NULL; + //check if page exists in store along with its thumbnail if (!m_mostVisitedPageStore->contains(pageUrl.toString(), true)) { - QSize thumbnailSize(200, 200); - pageThumbnail = new QImage(thumbnailSize.width(), thumbnailSize.height(), QImage::Format_RGB32); - QPainter painter(pageThumbnail); - qreal webcoreScale = page->mainFrame()->zoomFactor(); - painter.scale(1.f / webcoreScale, 1.f / webcoreScale); - painter.fillRect(0, 0, size().width(), size().height(), QColor(255, 255, 255)); - page->mainFrame()->render(&painter, QWebFrame::AllLayers, QRegion(0, 0, thumbnailSize.width(), thumbnailSize.height())); + qreal scale = 200.0 / page->viewportSize().width(); + QImage img = page->pageThumbnail(scale, scale); + pageThumbnail = new QImage(img); } //if it is a new page to the store, get its rank from history @@ -219,5 +220,10 @@ } } +void MostVisitedPagesWidget::clearMVStore() +{ + m_mostVisitedPageStore->clearMostVisitedPageStore(); +} + } // endof namespace GVA diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/mostvisitedpageview.h --- a/ginebra2/mostvisitedpageview.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/mostvisitedpageview.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,35 +1,41 @@ /* * 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include +#include "ChromeItem.h" #include "ChromeSnippet.h" +#include "ChromeWidget.h" namespace GVA { class LinearFlowSnippet; } namespace GVA { +class WRT::WrtBrowserContainer; -class MostVisitedPagesWidget : public QGraphicsWidget +class MostVisitedPagesWidget : public ChromeItem { Q_OBJECT public : //construction and destruction - MostVisitedPagesWidget(ChromeSnippet* snippet,QGraphicsWidget* parent); + MostVisitedPagesWidget(ChromeSnippet* snippet, ChromeWidget* chrome); ~MostVisitedPagesWidget(); void open(); @@ -40,7 +46,7 @@ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void setCenterIndex(QString displayMode); void updateMVGeometry(); - void updateMVStore(QWebPage *page); + void updateMVStore(WRT::WrtBrowserContainer *page); Q_SIGNALS: void closeComplete(); @@ -53,13 +59,13 @@ void okTriggered(int index); void closeAnimationCompleted(); void onLoadFinished(const bool ok); - + void clearMVStore(); private : - MostVisitedPageStore* m_mostVisitedPageStore; + MostVisitedPageStore* m_mostVisitedPageStore; QGraphicsWidget* m_parent; + ChromeWidget * m_chrome; GVA::LinearFlowSnippet *m_flowInterface; int m_selectIndex; - ChromeSnippet* m_snippet; bool m_hideOnClose; }; -} \ No newline at end of file +} diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/mostvisitedsnippet.cpp --- a/ginebra2/mostvisitedsnippet.cpp Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/mostvisitedsnippet.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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: * */ - #include "mostvisitedsnippet.h" #include "mostvisitedpageview.h" @@ -26,10 +29,18 @@ m_chrome = chrome; } -void MostVisitedSnippet::toggleVisibility(bool animate) +MostVisitedSnippet * MostVisitedSnippet::instance(const QString& elementId, ChromeWidget * chrome, const QWebElement & element) +{ + MostVisitedSnippet* that = new MostVisitedSnippet(elementId, chrome, 0, element); + that->setChromeWidget( new MostVisitedPagesWidget(that, chrome) ); + that->widget()->hide(); //TODO: Shouldn't be needed? + return that; +} + +void MostVisitedSnippet::toggleVisibility(bool animate) { MostVisitedPagesWidget *mostVisitedPagesWidget = dynamic_cast(widget()); - if (!mostVisitedPagesWidget) + if (!mostVisitedPagesWidget) return; if (!isVisible()) { @@ -44,10 +55,10 @@ } -void MostVisitedSnippet::setWidget(QGraphicsWidget * widget) +void MostVisitedSnippet::setChromeWidget(QGraphicsWidget * widget) { connect(m_chrome , SIGNAL(aspectChanged(int)), this, SLOT(displayModeChanged(int))); - ChromeSnippet::setWidget(widget); + ChromeSnippet::setChromeWidget(widget); MostVisitedPagesWidget *mostVisitedPagesWidget = dynamic_cast(widget); connect(mostVisitedPagesWidget, SIGNAL(closeComplete()), this, SIGNAL(mostVisitedSnippetCloseComplete())); } @@ -59,22 +70,22 @@ ChromeSnippet* visibleSnippet= m_chrome->getSnippet("WebViewToolbarId"); if (visibleSnippet) - toolBarHeight = visibleSnippet->widget()->rect().height(); + toolBarHeight = visibleSnippet->widget()->rect().height(); - mostVisitedPagesWidget->resize(m_chrome->size().toSize()); + mostVisitedPagesWidget->resize(m_chrome->layout()->size().toSize()); mostVisitedPagesWidget->updatePos(QPointF(0, 0), toolBarHeight); } void MostVisitedSnippet::displayModeChanged(int newMode) { - if (isVisible()) { + if (isVisible()) { MostVisitedPagesWidget *mostVisitedPagesWidget = dynamic_cast(widget()); - - if (!mostVisitedPagesWidget) + + if (!mostVisitedPagesWidget) return; updateMVGeometry(); - + QString displayMode = (newMode == landscape) ? "Landscape" : "Portrait"; mostVisitedPagesWidget->displayModeChanged(displayMode); } @@ -83,19 +94,19 @@ void MostVisitedSnippet::hide(bool animate) { MostVisitedPagesWidget *mostVisitedPagesWidget = dynamic_cast(widget()); - - if(!mostVisitedPagesWidget) + + if (!mostVisitedPagesWidget) return; ChromeSnippet::hide(animate); mostVisitedPagesWidget->closeAnimationCompleted(); } -void MostVisitedSnippet::close() +void MostVisitedSnippet::close() { MostVisitedPagesWidget *mostVisitedPagesWidget = dynamic_cast(widget()); - - if(mostVisitedPagesWidget) { + + if (mostVisitedPagesWidget) { mostVisitedPagesWidget->close(); } } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/mostvisitedsnippet.h --- a/ginebra2/mostvisitedsnippet.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/mostvisitedsnippet.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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". +* +* 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. * -* Initial Contributors: -* Nokia Corporation - initial contribution. +* 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 MOSTVISITEDSNIPPET_H #define MOSTVISITEDSNIPPET_H @@ -23,16 +26,17 @@ #include "ChromeWidget.h" namespace GVA { - + class MostVisitedSnippet : public ChromeSnippet { Q_OBJECT public: MostVisitedSnippet(const QString & elementId, ChromeWidget * chrome, QGraphicsWidget * widget, const QWebElement & element); + static MostVisitedSnippet * instance(const QString& elementId, ChromeWidget * chrome, const QWebElement & element); void toggleVisibility(bool animate); void hide(bool animate); void updateMVGeometry(); - void setWidget(QGraphicsWidget * widget); + void setChromeWidget(QGraphicsWidget * widget); virtual ~MostVisitedSnippet(); void close(); Q_SIGNALS: diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/sym_iap_util.h --- a/ginebra2/sym_iap_util.h Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/sym_iap_util.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,494 +1,3 @@ -/* -* Copyright (c) 2010 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. -* -* Contributors: -* -* Description: -* -*/ - -#ifndef QSYM_IAP_UTIL_H -#define QSYM_IAP_UTIL_H - -// Symbian -#include -#include -#include -#include -#include -#include -#include - -// OpenC -#include -#include - -//Qt -#include -#include -//#include - -_LIT(KIapNameSetting, "IAP\\Name"); // text - mandatory -_LIT(KIapDialogPref, "IAP\\DialogPref"); // TUnit32 - optional -_LIT(KIapService, "IAP\\IAPService"); // TUnit32 - mandatory -_LIT(KIapServiceType, "IAP\\IAPServiceType"); // text - mandatory -_LIT(KIapBearer, "IAP\\IAPBearer"); // TUint32 - optional -_LIT(KIapBearerType, "IAP\\IAPBearerType"); // text - optional -_LIT(KIapNetwork, "IAP\\IAPNetwork"); // TUint32 - optional - -const QLatin1String qtOrganizationTag("Trolltech"); -const QLatin1String qtNetworkModuleTag("QtNetwork"); -const QLatin1String iapGroupTag("IAP"); -const QLatin1String iapNamesArrayTag("Names"); -const QLatin1String iapNameItemTag("Name"); - -static QTextCodec *utf16LETextCodec = 0; - -void clearIapNamesSettings(QSettings &settings) { - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - settings.remove(iapNamesArrayTag); - settings.endGroup(); - settings.endGroup(); -} - -void writeIapNamesSettings(QSettings &settings, const QStringList& iapNames) { - clearIapNamesSettings(settings); - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - settings.beginWriteArray(iapNamesArrayTag); - for (int index = 0; index < iapNames.size(); ++index) { - settings.setArrayIndex(index); - settings.setValue(iapNameItemTag, iapNames.at(index)); - } - settings.endArray(); - settings.endGroup(); - settings.endGroup(); -} - -void readIapNamesSettings(QSettings &settings, QStringList& iapNames) { - settings.beginGroup(qtNetworkModuleTag); - settings.beginGroup(iapGroupTag); - int last = settings.beginReadArray(iapNamesArrayTag); - for (int index = 0; index < last; ++index) { - settings.setArrayIndex(index); - iapNames.append(settings.value(iapNameItemTag).toString()); - } - settings.endArray(); - settings.endGroup(); - settings.endGroup(); -} - -static QString qt_TNameToQString(TName data) { - if(utf16LETextCodec == 0) - utf16LETextCodec = QTextCodec::codecForName("UTF-16LE"); - - QByteArray tmpByteArray = QByteArray::fromRawData((char*)(data.PtrZ()), data.Length() * 2); - return utf16LETextCodec->toUnicode(tmpByteArray); -} - -static QString qt_InterfaceInfoL() -{ - QString output; - - TBuf8<512> buffer; - TBuf<128> t; - TAutoClose ss; - User::LeaveIfError(ss.iObj.Connect()); - ss.PushL(); - - TAutoClose sock; - User::LeaveIfError(sock.iObj.Open(ss.iObj, _L("udp"))); - sock.PushL(); - - User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl)); - - TProtocolDesc in; - User::LeaveIfError(sock.iObj.Info(in)); - printf("EPOC32 IP Configuration TCPIP Version %d.%d.%d\n", in.iVersion.iMajor, in.iVersion.iMinor, in.iVersion.iBuild); - - TPckgBuf info, next; - - TInt res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info); - if(res!=KErrNone) - User::Leave(res); - TInt count = 0; - while(res==KErrNone) { - res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, next); - - if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) { - printf("Interface %d\n", count++); - - printf("Name \"%s\"\n", qt_TNameToQString(info().iName).toLatin1().data()); - printf("NIF tag \"%s\"\n", qt_TNameToQString(info().iTag).toLatin1().data()); - - printf("State "); - switch (info().iState) - { - case EIfPending: - printf("pending\n"); - break; - case EIfUp: - printf("up\n"); - break; - case EIfBusy: - printf("busy\n"); - break; - default: - printf("down\n"); - break; - } - - printf("Mtu %d\n", info().iMtu); - printf("Speed Metric %d\n", info().iSpeedMetric); - - printf("Features:"); - info().iFeatures & KIfIsLoopback ? printf(" loopback") : printf(""); - info().iFeatures & KIfIsDialup ? printf(" dialup") : printf(""); - info().iFeatures & KIfIsPointToPoint ? printf(" pointtopoint") : printf(""); - info().iFeatures & KIfCanBroadcast ? printf(" canbroadcast") : printf(""); - info().iFeatures & KIfCanMulticast ? printf(" canmulticast") : printf(""); - info().iFeatures & KIfCanSetMTU ? printf(" cansetmtu") : printf(""); - info().iFeatures & KIfHasHardwareAddr ? printf(" hardwareaddr") : printf(""); - info().iFeatures & KIfCanSetHardwareAddr ? printf(" cansethardwareaddr") : printf(""); - printf("\n"); - - TName address; - info().iAddress.Output(address); - printf("Addr: %s\n", qt_TNameToQString(address).toLatin1().data()); - - if(info().iAddress.IsLinkLocal()) { - printf(" -link local\n"); - } else if(info().iAddress.IsSiteLocal()) { - printf(" -site local\n"); - } else { - printf(" -global\n"); - } - - info().iNetMask.Output(address); - printf("Netmask %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iBrdAddr.Output(address); - printf("Broadcast address %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iDefGate.Output(address); - printf("Gatew: %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iNameSer1.Output(address); - printf("DNS 1: %s\n", qt_TNameToQString(address).toLatin1().data()); - - info().iNameSer2.Output(address); - printf("DNS 2: %s\n", qt_TNameToQString(address).toLatin1().data()); - - if (info().iHwAddr.Family() != KAFUnspec) { - printf("Hardware address "); - TUint j; - for(j = sizeof(SSockAddr) ; j < sizeof(SSockAddr) + 6 ; ++j) { - if(j < (TUint)info().iHwAddr.Length()) { - printf("%02X", info().iHwAddr[j]); - } else { - printf("??"); - } - if(j < sizeof(SSockAddr) + 5) - printf("-"); - else - printf("\n"); - } - } - } - if(res == KErrNone) { - info = next; - printf("\n"); - } else { - printf("\n"); - } - } - - sock.Pop(); - ss.Pop(); - - return output; -} - -static QString qt_RouteInfoL() { - QString output; - TAutoClose ss; - User::LeaveIfError(ss.iObj.Connect()); - ss.PushL(); - - TAutoClose sock; - User::LeaveIfError(sock.iObj.Open(ss.iObj, _L("udp"))); - sock.PushL(); - - TSoInetRouteInfo routeInfo; - TPckg routeInfoPkg(routeInfo); - - TName destAddr; - TName netMask; - TName gateway; - TName ifAddr; - - // Begins enumeration of routes by setting this option - User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumRoutes, KSolInetRtCtrl)); - - // The TSoInetRouteInfo contains information for a new route each time GetOpt returns KErrNone - for(TInt i = 0; sock.iObj.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone ; i++) - { - // Extract the destination and netmask - routeInfo.iDstAddr.Output(destAddr); - routeInfo.iNetMask.Output(netMask); - routeInfo.iGateway.Output(gateway); - routeInfo.iIfAddr.Output(ifAddr); -/* - if(destAddr.Length() <= 2) - continue; - - if(netMask.Find(_L("255.255.255.255")) != KErrNotFound - || netMask.Find(_L("0.0.0.0")) != KErrNotFound - || netMask.Find(_L("ffff:ffff:ffff:ffff")) != KErrNotFound) - continue; -*/ - printf("Route Info #[%i]\n", i); - printf("DstAddr %s\n", qt_TNameToQString(destAddr).toLatin1().data()); - printf("NetMask %s\n", qt_TNameToQString(netMask).toLatin1().data()); - printf("Gateway %s\n", qt_TNameToQString(gateway).toLatin1().data()); - printf("IfAddr %s\n", qt_TNameToQString(ifAddr).toLatin1().data()); - printf("\n"); - } - - sock.Pop(); - ss.Pop(); - - return output; -} - -QString qt_TDesC2QStringL(const TDesC& aDescriptor) -{ -#ifdef QT_NO_UNICODE - return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length()); -#else - return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length()); -#endif -} - -static bool qt_SetDefaultIapName(const QString &iapName, int &error) { - struct ifreq ifReq; - // clear structure - memset(&ifReq, 0, sizeof(struct ifreq)); - // set IAP name value - // make sure it is in UTF8 - strcpy(ifReq.ifr_name, iapName.toUtf8().data()); - - if(setdefaultif(&ifReq) == 0) { - // OK - error = 0; - return true; - } else { - error = errno; - return false; - } - -} -static bool qt_SetDefaultSnapId(const int snapId, int &error) { - struct ifreq ifReq; - // clear structure - memset(&ifReq, 0, sizeof(struct ifreq)); - // set SNAP ID value - ifReq.ifr_ifru.snap_id = snapId; - - if(setdefaultif(&ifReq) == 0) { - // OK - error = 0; - return true; - } else { - error = errno; - return false; - } - -} - -static void qt_SaveIapName(QSettings& settings, QStringList& iapNames, QString& iapNameValue) { - if(iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) { - // no need to update - } else { - if(iapNameValue != QString("Easy WLAN")) { - // new selection alway on top - iapNames.removeAll(iapNameValue); - iapNames.prepend(iapNameValue); - writeIapNamesSettings(settings, iapNames); - } else { - // Unbeliveable ... if IAP dodn't exist before - // no matter what you choose from IAP selection list - // you will get "Easy WLAN" as IAP name value - - // somehow commsdb is not in sync - } - } -} - -static QString qt_OfferIapDialog() { - TBuf8<256> iapName; - - RSocketServ socketServ; - CleanupClosePushL(socketServ); - - RConnection connection; - CleanupClosePushL(connection); - - socketServ.Connect(); - connection.Open(socketServ); - connection.Start(); - - connection.GetDesSetting(TPtrC(KIapNameSetting), iapName); - - //connection.Stop(); - - iapName.ZeroTerminate(); - QString strIapName((char*)iapName.Ptr()); - - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } - - CleanupStack::PopAndDestroy(&connection); - CleanupStack::PopAndDestroy(&socketServ); - - return strIapName; -} - -static QString qt_CheckForActiveConnection() { - TUint count; - - RSocketServ serv; - CleanupClosePushL(serv); - - RConnection conn; - CleanupClosePushL(conn); - - serv.Connect(); - conn.Open(serv); - - TConnectionInfoBuf connInfo; - - TBuf8<256> iapName; - TBuf8<256> iapServiceType; - - QString strIapName; - - if (conn.EnumerateConnections(count) == KErrNone) { - if(count > 0) { - for (TUint i = 1; i <= count; i++) { - if (conn.GetConnectionInfo(i, connInfo) == KErrNone) { - RConnection tempConn; - CleanupClosePushL(tempConn); - tempConn.Open(serv); - if (tempConn.Attach(connInfo, RConnection::EAttachTypeNormal) == KErrNone) { - tempConn.GetDesSetting(TPtrC(KIapNameSetting), iapName); - tempConn.GetDesSetting(TPtrC(KIapServiceType), iapServiceType); - //tempConn.Stop(); - iapName.ZeroTerminate(); - iapServiceType.ZeroTerminate(); - -// if(iapServiceType.Find(_L8("LANService")) != KErrNotFound) { -// activeLanConnectionFound = ETrue; -// break; -// } - strIapName = QString((char*)iapName.Ptr()); - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } - - CleanupStack::PopAndDestroy(&tempConn); - break; - } - } - } - } - } - - //conn.Stop(); - - CleanupStack::PopAndDestroy(&conn); - CleanupStack::PopAndDestroy(&serv); - - return strIapName; -} - -static QString qt_CheckSettingsForConnection(QStringList& iapNames) { - QString strIapName; - for(int index = 0; index < iapNames.size(); ++index) { - strIapName = iapNames.at(index); - int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { - //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); - strIapName = QString(""); - } else { - return strIapName; - } - } - return strIapName; -} - -static void qt_SetDefaultIapL() -{ - // settings @ /c/data/.config/Trolltech.com - QSettings settings(QSettings::UserScope, qtOrganizationTag); - // populate iap name list - QStringList iapNames; - readIapNamesSettings(settings, iapNames); - - QString iapNameValue; - - iapNameValue = qt_CheckForActiveConnection(); - - if(!iapNameValue.isEmpty()) { - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - } - - iapNameValue = qt_CheckSettingsForConnection(iapNames); - - if(!iapNameValue.isEmpty()) { - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - } - - /* - * no active LAN connections yet - * no IAP in settings - * offer IAP dialog to user - */ - iapNameValue = qt_OfferIapDialog(); - qt_SaveIapName(settings, iapNames, iapNameValue); - return; - -} - -static int qt_SetDefaultIap() -{ -//#ifndef __WINS__ - TRAPD(err1, qt_SetDefaultIapL()); -// TRAPD(err2, qt_InterfaceInfoL()); -// TRAPD(err3, qt_RouteInfoL()); - return err1; -//#else - return 0; // IAP dialog not required for emulator -//#endif -} - -#endif // QSYM_IAP_UTIL_H /**************************************************************************** ** ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). @@ -602,7 +111,7 @@ } static QString qt_TNameToQString(TName data) { - if(utf16LETextCodec == 0) + if (utf16LETextCodec == 0) utf16LETextCodec = QTextCodec::codecForName("UTF-16LE"); QByteArray tmpByteArray = QByteArray::fromRawData((char*)(data.PtrZ()), data.Length() * 2); @@ -632,13 +141,13 @@ TPckgBuf info, next; TInt res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info); - if(res!=KErrNone) + if (res!=KErrNone) User::Leave(res); TInt count = 0; - while(res==KErrNone) { + while (res==KErrNone) { res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, next); - if(info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) { + if (info().iName != _L("") && info().iName != _L("loop6") && info().iName != _L("loop4")) { printf("Interface %d\n", count++); printf("Name \"%s\"\n", qt_TNameToQString(info().iName).toLatin1().data()); @@ -679,9 +188,9 @@ info().iAddress.Output(address); printf("Addr: %s\n", qt_TNameToQString(address).toLatin1().data()); - if(info().iAddress.IsLinkLocal()) { + if (info().iAddress.IsLinkLocal()) { printf(" -link local\n"); - } else if(info().iAddress.IsSiteLocal()) { + } else if (info().iAddress.IsSiteLocal()) { printf(" -site local\n"); } else { printf(" -global\n"); @@ -705,20 +214,20 @@ if (info().iHwAddr.Family() != KAFUnspec) { printf("Hardware address "); TUint j; - for(j = sizeof(SSockAddr) ; j < sizeof(SSockAddr) + 6 ; ++j) { - if(j < (TUint)info().iHwAddr.Length()) { + for (j = sizeof(SSockAddr) ; j < sizeof(SSockAddr) + 6 ; ++j) { + if (j < (TUint)info().iHwAddr.Length()) { printf("%02X", info().iHwAddr[j]); } else { printf("??"); } - if(j < sizeof(SSockAddr) + 5) + if (j < sizeof(SSockAddr) + 5) printf("-"); else printf("\n"); } } } - if(res == KErrNone) { + if (res == KErrNone) { info = next; printf("\n"); } else { @@ -754,7 +263,7 @@ User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumRoutes, KSolInetRtCtrl)); // The TSoInetRouteInfo contains information for a new route each time GetOpt returns KErrNone - for(TInt i = 0; sock.iObj.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone ; i++) + for (TInt i = 0; sock.iObj.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone ; i++) { // Extract the destination and netmask routeInfo.iDstAddr.Output(destAddr); @@ -762,10 +271,10 @@ routeInfo.iGateway.Output(gateway); routeInfo.iIfAddr.Output(ifAddr); /* - if(destAddr.Length() <= 2) + if (destAddr.Length() <= 2) continue; - if(netMask.Find(_L("255.255.255.255")) != KErrNotFound + if (netMask.Find(_L("255.255.255.255")) != KErrNotFound || netMask.Find(_L("0.0.0.0")) != KErrNotFound || netMask.Find(_L("ffff:ffff:ffff:ffff")) != KErrNotFound) continue; @@ -801,7 +310,7 @@ // make sure it is in UTF8 strcpy(ifReq.ifr_name, iapName.toUtf8().data()); - if(setdefaultif(&ifReq) == 0) { + if (setdefaultif(&ifReq) == 0) { // OK error = 0; return true; @@ -818,7 +327,7 @@ // set SNAP ID value ifReq.ifr_ifru.snap_id = snapId; - if(setdefaultif(&ifReq) == 0) { + if (setdefaultif(&ifReq) == 0) { // OK error = 0; return true; @@ -830,10 +339,10 @@ } static void qt_SaveIapName(QSettings& settings, QStringList& iapNames, QString& iapNameValue) { - if(iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) { + if (iapNames.contains(iapNameValue) && iapNames.first() == iapNameValue) { // no need to update } else { - if(iapNameValue != QString("Easy WLAN")) { + if (iapNameValue != QString("Easy WLAN")) { // new selection alway on top iapNames.removeAll(iapNameValue); iapNames.prepend(iapNameValue); @@ -869,7 +378,7 @@ QString strIapName((char*)iapName.Ptr()); int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { + if (!qt_SetDefaultIapName(strIapName, error)) { //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); strIapName = QString(""); } @@ -900,7 +409,7 @@ QString strIapName; if (conn.EnumerateConnections(count) == KErrNone) { - if(count > 0) { + if (count > 0) { for (TUint i = 1; i <= count; i++) { if (conn.GetConnectionInfo(i, connInfo) == KErrNone) { RConnection tempConn; @@ -911,15 +420,15 @@ tempConn.GetDesSetting(TPtrC(KIapServiceType), iapServiceType); //tempConn.Stop(); iapName.ZeroTerminate(); - iapServiceType.ZeroTerminate(); + iapServiceType.ZeroTerminate(); -// if(iapServiceType.Find(_L8("LANService")) != KErrNotFound) { +// if (iapServiceType.Find(_L8("LANService")) != KErrNotFound) { // activeLanConnectionFound = ETrue; // break; // } - strIapName = QString((char*)iapName.Ptr()); + strIapName = QString((char*)iapName.Ptr()); int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { + if (!qt_SetDefaultIapName(strIapName, error)) { //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); strIapName = QString(""); } @@ -942,10 +451,10 @@ static QString qt_CheckSettingsForConnection(QStringList& iapNames) { QString strIapName; - for(int index = 0; index < iapNames.size(); ++index) { + for (int index = 0; index < iapNames.size(); ++index) { strIapName = iapNames.at(index); int error = 0; - if(!qt_SetDefaultIapName(strIapName, error)) { + if (!qt_SetDefaultIapName(strIapName, error)) { //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error); strIapName = QString(""); } else { @@ -967,14 +476,14 @@ iapNameValue = qt_CheckForActiveConnection(); - if(!iapNameValue.isEmpty()) { + if (!iapNameValue.isEmpty()) { qt_SaveIapName(settings, iapNames, iapNameValue); return; } iapNameValue = qt_CheckSettingsForConnection(iapNames); - if(!iapNameValue.isEmpty()) { + if (!iapNameValue.isEmpty()) { qt_SaveIapName(settings, iapNames, iapNameValue); return; } diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/translations/Browser.xls Binary file ginebra2/translations/Browser.xls has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/translations/browserLoc.qm Binary file ginebra2/translations/browserLoc.qm has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/translations/browserLoc.ts --- a/ginebra2/translations/browserLoc.ts Fri May 14 15:40:36 2010 +0300 +++ b/ginebra2/translations/browserLoc.ts Tue Jun 29 00:46:29 2010 -0400 @@ -1,142 +1,666 @@ - + - + - - txt_browser_status_bar_stop - Stop - - - txt_browser_status_bar_go - Go - - - txt_browser_status_bar_reload - Reload - - - txt_browser_windows_new_window - New Window - - - txt_browser_windows_windows - Windows - - - txt_browser_windows_blank - Blank - - - txt_browser_offline - Offline - - - txt_browser_settings_clear_cache - Clear Cache - - - txt_browser_settings_clear_cookies - Clear Cookies - - - txt_browser_settings_clear_history - Clear History - - - txt_browser_settings_clear_all - Clear All - - - txt_browser_content_view_browser - Browser - - - txt_browser_settings_settings - Settings - - - txt_browser_content_view_menu_exit - Exit - - - txt_browser_content_view_menu_bookmarks - Bookmarks - - - txt_browser_content_view_menu_history - History - - - txt_browser_content_view_menu_download - Download - - - txt_browser_content_view_most_visited - Most Visited - - - txt_browser_content_view_most_visited_pages - Most Visited Pages - - - txt_browser_bookmarks_done - Done - - - txt_browser_bookmarks_cancel - Cancel - - - txt_browser_windows_max_number_open - Maximum number of windows is already open. Close a window and try again. - - - txt_browser_windows_max_number_open_ok - OK - - - txt_browser_windows_add_new_window - Add New Window - - - txt_browser_content_view_back - Back - - - txt_browser_history_today - Today - - - txt_browser_history_yesterday - Yesterday - - - txt_browser_history_this_week - This Week - - - txt_browser_history_this_month - This Month - - - txt_browser_open_file - Open File - - - txt_browser_page_load_failed - Page load failed - - - fmt_browser_downloading_file - Downloading %1 - - - fmt_browser_file_has_finished_downloading - %1 has finished downloading. - - - fmt_browser_tag_error_tag_file_could_not_be_downloaded - %1Error:%2 %3 could not be downloaded. - + + Info note for when there is a download error and item is not downloaded, %1 is the name of the item + Error: %1 could not be downloaded + + txt_browser_downloading_file + Browser_Downloads_001 + dpopinfo + Br + False + + + Title of Content View. + Browser + + txt_browser_windows_new_window + Browser_Content_Title_001 + title + Br + False + + + Title of Windows View + Windows + + txt_browser_windows_new_window + Browser_Windows_001 + title + Br + False + + + Subheading Label in History List + This Month + + txt_browser_history_today + Browser_History_001 + subhead + Br + False + + + Button text when adding/editing a bookmark + Cancel + + txt_browser_bookmarks_done + Browser_Bookmarks_001a + button + Br + False + + + Layout ID parent. Error info notification message + Unable to load page + + txt_browser_error_page_load_failed + Browser_Error_Dialog_001 + dpopinfo + Br + False + + + Layout ID parent. Error info notification message + Info Message + + txt_browser_info_message + Browser_Error_Dialog_001 + dpopinfo + Br + False + + + For the title of the Most Visited pages grid + Most Visited + + txt_browser_most_visited_title_most_visited + Browser_Content_Most_Visited_001 + title + Br + False + + + Layout ID parent. Content View Context Menu Page tab Allow Pop-ups menu item + Allow Pop-ups + + txt_browser_content_view_menu_page_allow_popups + Browser_Content_Context_Menu_001b + menu + Br + False + + + Subheader in Settings View for General Settings + General Settings + + txt_browser_settings_clear_data + Browser_Settings_001b + subhead + Br + False + + + Layout ID parent. Title displayed above a new, blank window in the Windows view. + New Window + + txt_browser_windows_new_window + Browser_Windows_001 + title + Br + False + + + Content View Context Menu Navigation tab Exit menu item + Exit Browser + + txt_browser_content_view_menu_nav_bookmarks + Browser_Content_Context_Menu_001a + menu + Br + False + + + Caption for Application Library - grid view + Web Browser + + qtl_grid_applications_sec + browser + grid + br + False + + + Displayed in the URL bar search suggestions drop-down menu, %1 is the search string + Search for %1 + + txt_browser_chrome_suggests_search_for + Browser_URLbar_001 + opt + Br + False + + + Content View Context Menu Navigation tab Settings menu item + Settings + + txt_browser_content_view_menu_nav_bookmarks + Browser_Content_Context_Menu_001a + menu + Br + False + + + Content View Context Menu Link tab + Link + + txt_browser_content_view_menu_tab_navigation + Browser_Content_Context_Menu_001c + tab + Br + False + + + Layout ID parent. Content View Context Menu Navigation tab Bookmarks menu item + Bookmarks + + txt_browser_content_view_menu_nav_bookmarks + Browser_Content_Context_Menu_001a + menu + Br + False + + + Content View Context Menu Link/Image tab - this tab is for images that are also links. So under it are: "open link in new window", "share link", "save image" + Link/Image + + txt_browser_content_view_menu_tab_navigation + Browser_Content_Context_Menu_001 + tab + Br + False + + + Layout ID parent. Subheader in Settings View for Clear Data + Clear Data + + txt_browser_settings_clear_data + Browser_Settings_001a + subhead + Br + False + + + Layout ID parent. In the Browser Settings, for clearing cache + Cache + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + Page title in Bookmarks View + Bookmarks + + txt_browser_windows_new_window + Browser_Bookmarks_001 + title + Br + False + + + Title of New Window in Content View + New Window + + txt_browser_content_view_new_window + Browser_Content_Title_001 + title + Br + False + + + Title of History View + History + + txt_browser_windows_new_window + Browser_History_001 + title + Br + False + + + Title of Settings View + Settings + + txt_browser_windows_new_window + Browser_Settings_001 + title + Br + False + + + Layout ID parent. Subheading Label in History List + Today + + txt_browser_history_today + Browser_History_001 + subhead + Br + False + + + In the Browser Settings, for setting an option to No + No + + txt_browser_settings_general_settings_yes + Browser_Settings_001b + setlabel_1_2_val + Br + False + + + Content View Context Menu Page tab Add Bookmark menu item + Add Bookmark + + txt_browser_content_view_menu_page_allow_popups + Browser_Content_Context_Menu_001b + menu + Br + False + + + Layout ID parent. Info note for when a new item starts downloading, %1 is the name of the item that is downloading + Downloading %1 + + txt_browser_downloading_file + Browser_Downloads_001 + dpopinfo + Br + False + + + Content View Context Menu Page tab Block Pop-ups menu item + Block Popups + + txt_browser_content_view_menu_page_allow_popups + Browser_Content_Context_Menu_001b + menu + Br + False + + + Content View Context Menu label for Page tab + Page + + txt_browser_content_view_menu_tab_navigation + Browser_Content_Context_Menu_001b + tab + Br + False + + + In the Browser Settings, for clearing form data + Form Data + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + Error dialog shown when device is running out of memory. + Close some browser windows or applications. + + txt_browser_error_dialog_device_low + Browser_Memory_Low_Dialog_001 + dpopinfo + Br + False + + + Content View Context Menu Navigation tab History menu item + History + + txt_browser_content_view_menu_nav_bookmarks + Browser_Content_Context_Menu_001a + menu + Br + False + + + Content View Context Menu Image tab Save Image menu item + Save Image + + txt_browser_content_view_menu_image_save_image + Browser_Content_Context_Menu_001d + menu + Br + False + + + Prompt shown when a new network is available to use as the browser's network connection, %1 is the network name + %1 is now in range. Switch connection? + + txt_browser_network_switch_connection + Browser_Network_001 + dialog + Br + False + + + Layout ID parent. Content View Context Menu label for Navigation tab + Navigation + + txt_browser_content_view_menu_tab_navigation + Browser_Content_Context_Menu_001a + tab + Br + False + + + Layout ID parent. Content View Context Menu Link tab Open Link in New Window menu item + Open Link in New Window + + txt_browser_content_view_menu_link_open_link + Browser_Content_Context_Menu_001c + menu + Br + False + + + In the Browser Settings, for clearing cookies + Cookies + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + Content View Context Menu Navigation tab Windows menu item + Windows + + txt_browser_content_view_menu_nav_bookmarks + Browser_Content_Context_Menu_001a + menu + Br + False + + + In the Browser Settings, for clearing all at once + Clear All + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + Content View Context Menu Page tab Share menu item + Share + + txt_browser_content_view_menu_page_allow_popups + Browser_Content_Context_Menu_001b + menu + Br + False + + + Layout ID parent. In the Browser Settings, for saving history + Save Browser History + + txt_browser_settings_general_settings_save_browser_history + Browser_Settings_001b + setlabel_1 + Br + False + + + Caption for Application Library - list view + Web Browser + + qtl_list_pri_large_graphic + browser + list + br + False + + + Generic error message in dialog when the network does not send an error. + Network error + + txt_browser_error_page_load_failed + Browser_Error_Dialog_001 + dpopinfo + Br + False + + + Layout ID parent. In the Browser Network switch connection dialog + Yes + + txt_browser_network_switch_connection_yes + Browser_Network_001 + button + Br + False + + + Content View Context Menu Link tab Share Link menu item + Share Link + + txt_browser_content_view_menu_link_open_link + Browser_Content_Context_Menu_001c + menu + Br + False + + + Content View Context Menu Image tab + Image + + txt_browser_content_view_menu_tab_navigation + Browser_Content_Context_Menu_001d + tab + Br + False + + + Status of browser connection, shown next to Page Title in Browser status bar in Content View + Offline + + txt_browser_offline + Browser_Content_Title_001 + title + Br + False + + + Info note for when an item has finished downloading, %1 is the name of the item that has been downloaded + %1 has finished downloading + + txt_browser_downloading_file + Browser_Downloads_001 + dpopinfo + Br + False + + + Layout ID parent. In the Browser Settings, for setting an option to Yes + Yes + + txt_browser_settings_general_settings_yes + Browser_Settings_001b + setlabel_1_2_val + Br + False + + + In the Browser Settings, for character encoding + Character Encoding + + txt_browser_settings_general_settings_save_browser_history + Browser_Settings_001b + formlabel_1 + Br + False + + + Layout ID parent. Button text when adding/editing a bookmark + Done + + txt_browser_bookmarks_done + Browser_Bookmarks_001a + button + Br + False + + + In the Browser Network switch connection dialog + No + + txt_browser_network_switch_connection_yes + Browser_Network_001 + button + Br + False + + + In the Browser Settings, for saving forms and passwords + Save Forms/Passwords + + txt_browser_settings_general_settings_save_browser_history + Browser_Settings_001b + setlabel_2 + Br + False + + + Dialog displayed in the History View when a user clears their History + Are you sure you want to permanently delete your history? + + txt_browser_history_delete_are_you_sure + Browser_History_001 + dialog + Br + False + + + In the Browser Settings, for clearing history + History + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + In the Browser Settings, for info about the browser (version info etc) + About Browser + + txt_browser_settings_general_settings_save_browser_history + Browser_Settings_001b + list + Br + False + + + Layout ID parent. Error dialog shown when device is running out of memory. + Device Low On Memory + + txt_browser_error_dialog_device_low + Browser_Memory_Low_Dialog_001 + dpophead + Br + False + + + In the Browser Settings, for clearing bookmarks + Bookmarks + + txt_browser_settings_clear_data_cache + Browser_Settings_001a + list + Br + False + + + Subheading Label in History List + Yesterday + + txt_browser_history_today + Browser_History_001 + subhead + Br + False + + + Layout ID parent. In the Browser Settings, drop-down menu item for character encoding. Automatic is the default item. + Automatic + + txt_browser_settings_general_settings_character_encoding_automatic + Browser_Settings_001b + formlabel_1_val + Br + False + + + Layout ID parent. Title for bookmarks dialog for adding a bm + Add Bookmark + + txt_browser_input_dial_add_bm + Browser_Bookmark_Dialog_001 + title + Br + False + + + Subheading Label in History List + This Week + + txt_browser_history_today + Browser_History_001 + subhead + Br + False + + + Caption for Task Switcher + Web Browser + + txt_tsw_caption_browser + tsw_01 + caption + ts + False + + + Title for bookmarks dialog for editing a bm + Edit Bookmark + + txt_browser_input_dial_add_bm + Browser_Bookmark_Dialog_001 + title + Br + False + + + In the Browser Settings, drop-down menu item for character encoding + Unicode + + txt_browser_settings_general_settings_character_encoding_automatic + Browser_Settings_001b + formlabel_1_val + Br + False + diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/translations/browserLoc_zh.qm Binary file ginebra2/translations/browserLoc_zh.qm has changed diff -r b0dd75e285d2 -r 0954f5dd2cd0 ginebra2/translations/browserLoc_zh.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ginebra2/translations/browserLoc_zh.ts Tue Jun 29 00:46:29 2010 -0400 @@ -0,0 +1,396 @@ + + + + + + Info note for when there is a download error and item is not downloaded. + Error: <file name> could not be downloaded + Error: <file name> could not be downloaded + + + + + False + + + Text on button to dismiss warning + OK + OK + + + + + False + + + Prompt shown when a new network is available to use as the browser's network connection + <Network name> is now in range. Switch connection? + <Network name> is now in range. Switch connection? + + + + + False + + + Title of Content View. We may not need this string, so this is a placeholder for now, just in case + Browser + 浏览 + + + + + False + + + Title of Windows View + Windows + 窗口标题 + + + + + False + + + Label in History List + Last Week + 上星期 + + + + + False + + + For the title of the Most Visited filmstrip + Most Visited + 访问次数最多的 + + + + + False + + + Button text when adding/editing a bookmark + Cancel + 取消 + + + + + False + + + Label in History List + Last Month + 上个月 + + + + + False + + + Label in History List + Older + 旧历史 + + + + + False + + + Error info notification message + Page load failed + 页面加载失败 + + + + + False + + + Label in History List + Three Weeks Ago + 三个星期前 + + + + + False + + + Exit Item in Content View Menu + Exit + 退出 + + + + + False + + + Bookmarks Item in Content View Menu + Bookmarks + 书签 + + + + + False + + + Title of New Window before a page is loaded + New Window + 新视窗 + + + + + False + + + Label in History List + Yesterday + 昨天 + + + + + False + + + Caption for Application Library - grid view + Web Browser + 浏览器 + qtl_grid_applications_sec + browser + grid + br + False + + + Caption for Application Library - list view + Web Browser + 浏览器 + qtl_list_pri_large_graphic + browser + list + br + False + + + Possible tooltip for the Back icon + Back + 以前 + + + + + False + + + In the Browser Settings, for clearing cache + Clear Cache + 清除缓存 + + + + + False + + + In the Browser Settings, for clearing cookies + Clear Cookies + 清除Cookies + + + + + False + + + In the Browser Settings, for clearing all + Clear All + 全部清除 + + + + + False + + + Info note for when an item has finished downloading. + <File name> has finished downloading + <File name> has finished downloading + + + + + False + + + Label in History List + Two Weeks Ago + 两星期前 + + + + + False + + + This is an icon now, but we may need a tooltip in the future. + Go + 进行 + + + + + False + + + Button text when adding/editing a bookmark + Done + 完成 + + + + + False + + + Possible tooltip for adding a new window + Add New Window + 添加新视窗 + + + + + False + + + This is an icon now, but we may need a tooltip in the future. + Stop + 停止 + + + + + False + + + History Item in Content View Menu + History + History + + + + + False + + + Warning text that appears when a user tries to open greater than the maximum number of windows allowed. + Maximum number of windows is already open. Close a window and try again. + Maximum number of windows is already open. Close a window and try again. + + + + + False + + + Label in History List + Today + Today + + + + + False + + + Page title in Bookmarks View + Bookmarks + 书签 + + + + + False + + + Title of Settings View + Settings + 设置 + + + + + False + + + Alternate for the title of the Most Visited filmstrip + Most Visited Pages + 访问次数最多的页面 + + + + + False + + + Label in History List + Earlier This Month + 本月 + + + + + False + + + This is an icon now, but we may need a tooltip in the future. + Reload + 刷新 + + + + + False + + + In the Browser Settings, for clearing history + Clear History + Clear History + + + + + False + + + Info note for when a new item starts downloading + Downloading <file name> + Downloading <file name> + + + + + False + + + Caption for Task Switcher + Web Browser + Web Browser + txt_tsw_caption_browser + tsw_01 + caption + ts + False + + + diff -r b0dd75e285d2 -r 0954f5dd2cd0 layers.sysdef.xml --- a/layers.sysdef.xml Fri May 14 15:40:36 2010 +0300 +++ b/layers.sysdef.xml Tue Jun 29 00:46:29 2010 -0400 @@ -7,7 +7,7 @@ - + diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmcallbacktimer.h --- a/qstmgesturelib/qstmcallbacktimer.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmcallbacktimer.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMCALLBACKTIMER_H_ #define QSTMCALLBACKTIMER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmfilelogger/qstmfilelogger.cpp --- a/qstmgesturelib/qstmfilelogger/qstmfilelogger.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmfilelogger/qstmfilelogger.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include #include #include diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmfilelogger/qstmfilelogger.h --- a/qstmgesturelib/qstmfilelogger/qstmfilelogger.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmfilelogger/qstmfilelogger.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMFILELOGGER_H_ #define QSTMFILELOGGER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgenericsimplegesture.cpp --- a/qstmgesturelib/qstmgenericsimplegesture.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgenericsimplegesture.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmfilelogger.h" #include "qstmutils.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgenericsimplegesture.h --- a/qstmgesturelib/qstmgenericsimplegesture.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgenericsimplegesture.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMGENERICSIMPLEGESTURE_H_ #define QSTMGENERICSIMPLEGESTURE_H_ #include "qstmgesture_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgesture_if.h --- a/qstmgesturelib/qstmgesture_if.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgesture_if.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMGESTURE_IF_H_ #define QSTMGESTURE_IF_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgestureapi.cpp --- a/qstmgesturelib/qstmgestureapi.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgestureapi.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,22 +1,25 @@ /* * Copyright (c) 2010 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. -* -* Contributors: +* 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. * -* Description: +* 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: +* Gesture UI Engine */ - // Gesture Library: Framework #include #include diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgestureapi.h --- a/qstmgesturelib/qstmgestureapi.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgestureapi.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMGESTUREAPI_H__ #define QSTMGESTUREAPI_H__ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgesturedefs.h --- a/qstmgesturelib/qstmgesturedefs.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgesturedefs.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMGESTUREDEFS_H_ #define QSTMGESTUREDEFS_H_ #include diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgestureengine.cpp --- a/qstmgesturelib/qstmgestureengine.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgestureengine.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgestureengine.h" #include "qstmfilelogger.h" #include "qstmutils.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgestureevent.cpp --- a/qstmgesturelib/qstmgestureevent.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgestureevent.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include #include #include "qstmgestureevent.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgestureevent.h --- a/qstmgesturelib/qstmgestureevent.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgestureevent.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMGESTUREEVENT_H_ #define QSTMGESTUREEVENT_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgesturelib.pro --- a/qstmgesturelib/qstmgesturelib.pro Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgesturelib.pro Tue Jun 29 00:46:29 2010 -0400 @@ -1,17 +1,21 @@ # -# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 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: # TEMPLATE = lib diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmgesturelistener_if.h --- a/qstmgesturelib/qstmgesturelistener_if.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmgesturelistener_if.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMGESTURELISTENER_H_ #define QSTMGESTURELISTENER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstateengine.cpp --- a/qstmgesturelib/qstmstateengine.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstateengine.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmstateengine.h" #include "qstmutils.h" #include "qstmuievent.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstateengine.h --- a/qstmgesturelib/qstmstateengine.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstateengine.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMSTATEENGINE_H_ #define QSTMSTATEENGINE_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstateengineconfig.cpp --- a/qstmgesturelib/qstmstateengineconfig.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstateengineconfig.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmstateengineconfig.h" #include "qstmstateengine.h" #include "qstmutils.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstateengineconfig.h --- a/qstmgesturelib/qstmstateengineconfig.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstateengineconfig.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMSTATEENGINECONFIG_H_ #define QSTMSTATEENGINECONFIG_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstatemachine.cpp --- a/qstmgesturelib/qstmstatemachine.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstatemachine.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmstatemachine.h" #include "qstmstateengine.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstatemachine.h --- a/qstmgesturelib/qstmstatemachine.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstatemachine.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMSTATEMACHINE_H_ #define QSTMSTATEMACHINE_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmstatemachine_v2.h --- a/qstmgesturelib/qstmstatemachine_v2.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmstatemachine_v2.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMSTATEMACHINE_V2_H_ #define QSTMSTATEMACHINE_V2_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmtimerinterface.h --- a/qstmgesturelib/qstmtimerinterface.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmtimerinterface.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMTIMERINTERFACE_H_ #define QSTMTIMERINTERFACE_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmuievent.cpp --- a/qstmgesturelib/qstmuievent.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmuievent.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include #include "qstmfilelogger.h" #include "qstmstatemachine.h" // for qstmUiEventEngine::Distance(dx,dy) diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmuievent.h --- a/qstmgesturelib/qstmuievent.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmuievent.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMUIEVENT_H_ #define QSTMUIEVENT_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmuievent_if.h --- a/qstmgesturelib/qstmuievent_if.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmuievent_if.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMUIEVENT_IF_H_ #define QSTMUIEVENT_IF_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmuieventsender.cpp --- a/qstmgesturelib/qstmuieventsender.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmuieventsender.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmstateengine.h" #include "qstmuievent.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmutils.cpp --- a/qstmgesturelib/qstmutils.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmutils.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2008 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: Gesture recognition utilities +* Description: Gesture recognition utilities * */ - #include "qstmutils.h" #include "qstmgesturedefs.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/qstmutils.h --- a/qstmgesturelib/qstmutils.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/qstmutils.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 _GESTURE_UTILS_H_ #define _GESTURE_UTILS_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmedgescrollgesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmedgescrollgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMEDGESCROLLGESTURERECOGNISER_H_ #define QSTMEDGESCROLLGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmflickgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmflickgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmflickgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmflickgesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmflickgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmflickgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmflickgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMFLICKGESTURERECOGNISER_H_ #define QSTMFLICKGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmhoveringgesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmhoveringgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMHOVERINGGESTURERECOGNISER_H_ #define QSTMHOVERINGGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmleftrightgesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmleftrightgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMLEFTRIGHTGESTURERECOGNISER_H_ #define QSTMLEFTRIGHTGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmlongpressgesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmlongpressgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMLONGPRESSGESTURERECOGNISER_H_ #define QSTMLONGPRESSGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmpangesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmpangesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmpangesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmpangesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmpangesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmpangesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmpangesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMPANGESTURERECOGNISER_H_ #define QSTMPANGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmpinchgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmpinchgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmpinchgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmpinchgesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmpinchgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmpinchgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmpinchgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMPINCHGESTURERECOGNISER_H_ #define QSTMPINCHGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmreleasegesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmreleasegesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmreleasegesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmreleasegesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmreleasegesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmreleasegesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmreleasegesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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 QSTMRELEASEGESTURERECOGNISER_H_ #define QSTMRELEASEGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmtapgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmtapgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmtapgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmtapgesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmtapgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmtapgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmtapgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMTAPGESTURERECOGNISER_H_ #define QSTMTAPGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmtouchgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmtouchgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmtouchgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmtouchgesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmtouchgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmtouchgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmtouchgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMTOUCHGESTURERECOGNISER_H_ #define QSTMTOUCHGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmunknowngesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmunknowngesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmunknowngesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmgenericsimplegesture.h" #include "qstmunknowngesturerecogniser.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmunknowngesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmunknowngesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmunknowngesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMUNKNOWNGESTURERECOGNISER_H_ #define QSTMUNKNOWNGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmupdowngesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmupdowngesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmupdowngesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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: * */ - #include "qstmupdowngesturerecogniser.h" #include "qstmgenericsimplegesture.h" #include "qstmuievent_if.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmupdowngesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmupdowngesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmupdowngesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMUPDOWNGESTURERECOGNISER_H_ #define QSTMUPDOWNGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmzoomgesturerecogniser.cpp --- a/qstmgesturelib/recognisers/qstmzoomgesturerecogniser.cpp Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmzoomgesturerecogniser.cpp Tue Jun 29 00:46:29 2010 -0400 @@ -1,20 +1,23 @@ /* * Copyright (c) 2010 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: * */ - #include #include #include "qstmzoomgesturerecogniser.h" diff -r b0dd75e285d2 -r 0954f5dd2cd0 qstmgesturelib/recognisers/qstmzoomgesturerecogniser.h --- a/qstmgesturelib/recognisers/qstmzoomgesturerecogniser.h Fri May 14 15:40:36 2010 +0300 +++ b/qstmgesturelib/recognisers/qstmzoomgesturerecogniser.h Tue Jun 29 00:46:29 2010 -0400 @@ -1,21 +1,24 @@ /* * Copyright (c) 2010 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 QSTMZOOMGESTURERECOGNISER_H_ #define QSTMZOOMGESTURERECOGNISER_H_ diff -r b0dd75e285d2 -r 0954f5dd2cd0 rom/browser.iby --- a/rom/browser.iby Fri May 14 15:40:36 2010 +0300 +++ b/rom/browser.iby Tue Jun 29 00:46:29 2010 -0400 @@ -29,211 +29,41 @@ /* From sf\app\browserui\browsercore\core\browsercore_template.pkg ***********************/ -file=ABI_DIR\BUILD_DIR\browsercore.dll SHARED_LIB_DIR\browsercore.dll +file=ABI_DIR\BUILD_DIR\BrowserCore.dll SHARED_LIB_DIR\BrowserCore.dll /* From sf\app\browserui\bedrockProvisioning\bedrockProvisioning_template.pkg ***********************/ file=ABI_DIR\BUILD_DIR\BedrockProvisioning.dll SHARED_LIB_DIR\BedrockProvisioning.dll data=\sf\app\browserui\bedrockProvisioning\template\200267EA.ini data\.config\Nokia\200267EA.ini -/* From sf\app\browserui\ginebra2\Bedrock_template.pkg ***********************/ +/* From sf\app\browserui\ginebra2\NokiaBrowser_template.pkg ***********************/ -file=ABI_DIR\BUILD_DIR\Bedrock.exe SHARED_LIB_DIR\Bedrock.exe -data=DATAZ_\RESOURCE_FILES_DIR\apps\Bedrock.rsc resource\apps\Bedrock.rsc -data=DATAZ_\private\10003a3f\import\apps\Bedrock_reg.rsc private\10003a3f\import\apps\Bedrock_reg.rsc -data=DATAZ_\RESOURCE_FILES_DIR\apps\Bedrock.mif resource\apps\Bedrock.mif -data=\sf\app\browserui\ginebra2\chrome\js\ActionButton.js data\Others\ginebra2\chrome\js\ActionButton.js -data=\sf\app\browserui\ginebra2\chrome\js\Bind.js data\Others\ginebra2\chrome\js\Bind.js -data=\sf\app\browserui\ginebra2\chrome\js\ContextMenu.js data\Others\ginebra2\chrome\js\ContextMenu.js -data=\sf\app\browserui\ginebra2\chrome\js\locale.js data\Others\ginebra2\chrome\js\locale.js -data=\sf\app\browserui\ginebra2\chrome\js\LongPress.js data\Others\ginebra2\chrome\js\LongPress.js -data=\sf\app\browserui\ginebra2\chrome\js\SimpleButton.js data\Others\ginebra2\chrome\js\SimpleButton.js -data=\sf\app\browserui\ginebra2\chrome\js\Test.js data\Others\ginebra2\chrome\js\Test.js -data=\sf\app\browserui\ginebra2\chrome\js\ToggleButton.js data\Others\ginebra2\chrome\js\ToggleButton.js -data=\sf\app\browserui\ginebra2\chrome\localpages\installnotes.html data\Others\ginebra2\chrome\localpages\installnotes.html -data=\sf\app\browserui\ginebra2\chrome\localpages\relnotes.html data\Others\ginebra2\chrome\localpages\relnotes.html -data=\sf\app\browserui\ginebra2\chrome\localpages\startpage.html data\Others\ginebra2\chrome\localpages\startpage.html -data=\sf\app\browserui\ginebra2\chrome\localpages\startpage_101.html data\Others\ginebra2\chrome\localpages\startpage_101.html -data=\sf\app\browserui\ginebra2\chrome\localpages\startpage.css data\Others\ginebra2\chrome\localpages\startpage.css -data=\sf\app\browserui\ginebra2\chrome\localpages\subpage.css data\Others\ginebra2\chrome\localpages\subpage.css -data=\sf\app\browserui\ginebra2\chrome\localpages\grad_tall.jpg data\Others\ginebra2\chrome\localpages\grad_tall.jpg -data=\sf\app\browserui\ginebra2\chrome\localpages\back.png data\Others\ginebra2\chrome\localpages\back.png -data=\sf\app\browserui\ginebra2\chrome\localpages\bedrock.png data\Others\ginebra2\chrome\localpages\bedrock.png -data=\sf\app\browserui\ginebra2\chrome\localpages\bedrock_splash.png data\Others\ginebra2\chrome\localpages\bedrock_splash.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button1.png data\Others\ginebra2\chrome\localpages\button1.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button2.png data\Others\ginebra2\chrome\localpages\button2.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button3.png data\Others\ginebra2\chrome\localpages\button3.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button4.png data\Others\ginebra2\chrome\localpages\button4.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_back.png data\Others\ginebra2\chrome\localpages\button_back.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_del.png data\Others\ginebra2\chrome\localpages\button_del.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_rel_notes.png data\Others\ginebra2\chrome\localpages\button_rel_notes.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_report_bug.png data\Others\ginebra2\chrome\localpages\button_report_bug.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_search_google.png data\Others\ginebra2\chrome\localpages\button_search_google.png -data=\sf\app\browserui\ginebra2\chrome\localpages\button_survey.png data\Others\ginebra2\chrome\localpages\button_survey.png -data=\sf\app\browserui\ginebra2\chrome\localpages\google.png data\Others\ginebra2\chrome\localpages\google.png -data=\sf\app\browserui\ginebra2\chrome\localpages\nokia_logo.png data\Others\ginebra2\chrome\localpages\nokia_logo.png -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-1.3.1.min.js data\Others\ginebra2\chrome\js\3rdparty\jquery-1.3.1.min.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-1.4.2.js data\Others\ginebra2\chrome\js\3rdparty\jquery-1.4.2.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\SlowlyFade-0.88.js data\Others\ginebra2\chrome\js\3rdparty\SlowlyFade-0.88.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-ui\effects.blind.js data\Others\ginebra2\chrome\js\3rdparty\jquery-ui\effects.blind.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-ui\effects.core.js data\Others\ginebra2\chrome\js\3rdparty\jquery-ui\effects.core.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-ui\ui.core.js data\Others\ginebra2\chrome\js\3rdparty\jquery-ui\ui.core.js -data=\sf\app\browserui\ginebra2\chrome\js\3rdparty\jquery-ui\ui.sortable.js data\Others\ginebra2\chrome\js\3rdparty\jquery-ui\ui.sortable.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\chrome.html data\Others\ginebra2\chrome\bedrockchrome\chrome.html -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\chrome.js data\Others\ginebra2\chrome\bedrockchrome\chrome.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\chrome.css data\Others\ginebra2\chrome\bedrockchrome\chrome.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\statusbar.js data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\statusbar.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\statusbar.css data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\statusbar.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\download_statusbar_icon.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\download_statusbar_icon.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\lock.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\lock.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt10.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt10.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt100.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt100.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt100_charging.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt100_charging.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt20.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt20.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt30.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt30.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt40.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt40.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt50.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt50.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt60.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt60.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt70.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt70.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt80.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt80.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt90.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\battery\batt90.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal0.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal0.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal100.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal100.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal25.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal25.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal50.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal50.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal75.png data\Others\ginebra2\chrome\bedrockchrome\statusbar.snippet\icons\signal\signal75.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\toolbar.js data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\toolbar.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\toolbar.css data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\toolbar.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\circle_bg-mini.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\circle_bg-mini.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\circle_bg.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\circle_bg.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_center.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_center.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_center_1pxwide.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_center_1pxwide.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_left.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_left.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_right.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\hoagie_bg_right.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_addbookmark_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_back_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_clearall_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_menu_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_mostvisited_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows1_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows2_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows3_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows4_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windows5_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_windowsadd_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom+_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom-_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom_disabled.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom_pressed.png data\Others\ginebra2\chrome\bedrockchrome\toolbar.snippet\icons\icon_zoom_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\download.snippet\download.js data\Others\ginebra2\chrome\bedrockchrome\download.snippet\download.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\download.snippet\download.css data\Others\ginebra2\chrome\bedrockchrome\download.snippet\download.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\download.snippet\icons\download_dialog_icon.png data\Others\ginebra2\chrome\bedrockchrome\download.snippet\icons\download_dialog_icon.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\contextmenu.js data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\contextmenu.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\contextmenu.css data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\contextmenu.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\list_itembg_pressed.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\list_itembg_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_bottom.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_bottom.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_bottom_pressed.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_bottom_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_center.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_center.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_center_pressed.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_center_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_top.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_top.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_top_pressed.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menubg_fixed_top_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_bookmarks.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_bookmarks.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_downloads.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_downloads.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_history.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_history.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_settings.png data\Others\ginebra2\chrome\bedrockchrome\contextmenu.snippet\icons\menu_icon_settings.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\urlsearch.js data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\urlsearch.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\urlsearch.css data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\urlsearch.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\go_btn.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\go_btn.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\go_btn_pressed.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\go_btn_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_center.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_center.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_left.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_left.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_right.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\inputbox_right.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\refresh_btn.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\refresh_btn.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\refresh_btn_pressed.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\refresh_btn_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\stop_btn.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\stop_btn.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\stop_btn_pressed.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\stop_btn_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\topbg.png data\Others\ginebra2\chrome\bedrockchrome\urlsearch.snippet\icons\topbg.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\suggests.snippet\suggests.js data\Others\ginebra2\chrome\bedrockchrome\suggests.snippet\suggests.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\suggests.snippet\suggests.css data\Others\ginebra2\chrome\bedrockchrome\suggests.snippet\suggests.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\windowcount.snippet\windowcount.js data\Others\ginebra2\chrome\bedrockchrome\windowcount.snippet\windowcount.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\windowcount.snippet\windowcount.css data\Others\ginebra2\chrome\bedrockchrome\windowcount.snippet\windowcount.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\networkstatus.snippet\networkstatus.js data\Others\ginebra2\chrome\bedrockchrome\networkstatus.snippet\networkstatus.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\networkstatus.snippet\networkstatus.css data\Others\ginebra2\chrome\bedrockchrome\networkstatus.snippet\networkstatus.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png data\Others\ginebra2\chrome\bedrockchrome\windowcount.snippet\icons\emptycircle.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\windowcount.snippet\icons\filledcircle.png data\Others\ginebra2\chrome\bedrockchrome\windowcount.snippet\icons\filledcircle.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\zoombar.js data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\zoombar.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\zoombar.css data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\zoombar.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+_disabled.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+_pressed.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom+_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-_disabled.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-_disabled.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-_pressed.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\icon_zoom-_pressed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\zoom_menu_bg.png data\Others\ginebra2\chrome\bedrockchrome\zoombar.snippet\icons\zoom_menu_bg.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\BookmarkView.html data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\BookmarkView.html -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkAddDialog.js data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkAddDialog.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkview.js data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkview.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkAddDialog.css data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkAddDialog.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkview.css data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\bookmarkview.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\add_bookmark_bg.png data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\add_bookmark_bg.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\cc0d0d-hatch.png data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\cc0d0d-hatch.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\delete-icon.gif data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\delete-icon.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\light-blue.bg.gif data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\light-blue.bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-collapsed.gif data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-collapsed.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-dark-bg.gif data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-dark-bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-expanded.gif data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\white-blue-expanded.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\Thumbs.db data\Others\ginebra2\chrome\bedrockchrome\bookmarkview.superpage\icons\Thumbs.db -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\historyView.html data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\historyView.html -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\historyview.js data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\historyview.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\historyview.css data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\historyview.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerarrow_closed.png data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerarrow_closed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerarrow_open.png data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerarrow_open.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerbg_closed.png data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerbg_closed.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerbg_open.png data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_headerbg_open.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_itembg.png data\Others\ginebra2\chrome\bedrockchrome\historyview.superpage\icons\list_itembg.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\SettingsView.html data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\SettingsView.html -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\settingsview.js data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\settingsview.js -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\settingsview.css data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\settingsview.css -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\cc0d0d-hatch.png data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\cc0d0d-hatch.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\google.png data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\google.png -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\delete-icon.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\delete-icon.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-bg.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-collapsed.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-collapsed.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-dark-bg.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-dark-bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-expanded.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\hover-expanded.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\light-blue.bg.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\light-blue.bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-collapsed.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-collapsed.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-dark-bg.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-dark-bg.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-expanded.gif data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\white-blue-expanded.gif -data=\sf\app\browserui\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\Thumbs.db data\Others\ginebra2\chrome\bedrockchrome\settingsview.superpage\icons\Thumbs.db +file=ABI_DIR\BUILD_DIR\NokiaBrowser.exe SHARED_LIB_DIR\NokiaBrowser.exe +data=DATAZ_\RESOURCE_FILES_DIR\apps\NokiaBrowser.rsc resource\apps\NokiaBrowser.rsc +data=DATAZ_\private\10003a3f\import\apps\NokiaBrowser_reg.rsc private\10003a3f\import\apps\NokiaBrowser_reg.rsc +data=DATAZ_\RESOURCE_FILES_DIR\apps\NokiaBrowser.mif resource\apps\NokiaBrowser.mif +data=\sf\app\browserui\ginebra2\chrome\localpages\installnotes.html private\10008D39\localpages\installnotes.html +data=\sf\app\browserui\ginebra2\chrome\localpages\relnotes.html private\10008D39\localpages\relnotes.html +data=\sf\app\browserui\ginebra2\chrome\localpages\startpage.html private\10008D39\localpages\startpage.html +data=\sf\app\browserui\ginebra2\chrome\localpages\startpage_101.html private\10008D39\localpages\startpage_101.html +data=\sf\app\browserui\ginebra2\chrome\localpages\startpage.css private\10008D39\localpages\startpage.css +data=\sf\app\browserui\ginebra2\chrome\localpages\subpage.css private\10008D39\localpages\subpage.css +data=\sf\app\browserui\ginebra2\chrome\localpages\grad_tall.jpg private\10008D39\localpages\grad_tall.jpg +data=\sf\app\browserui\ginebra2\chrome\localpages\back.png private\10008D39\localpages\back.png +data=\sf\app\browserui\ginebra2\chrome\localpages\bedrock.png private\10008D39\localpages\bedrock.png +data=\sf\app\browserui\ginebra2\chrome\localpages\bedrock_splash.png private\10008D39\localpages\bedrock_splash.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button1.png private\10008D39\localpages\button1.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button2.png private\10008D39\localpages\button2.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button3.png private\10008D39\localpages\button3.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button4.png private\10008D39\localpages\button4.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_back.png private\10008D39\localpages\button_back.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_del.png private\10008D39\localpages\button_del.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_rel_notes.png private\10008D39\localpages\button_rel_notes.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_report_bug.png private\10008D39\localpages\button_report_bug.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_search_google.png private\10008D39\localpages\button_search_google.png +data=\sf\app\browserui\ginebra2\chrome\localpages\button_survey.png private\10008D39\localpages\button_survey.png +data=\sf\app\browserui\ginebra2\chrome\localpages\google.png private\10008D39\localpages\google.png +data=\sf\app\browserui\ginebra2\chrome\localpages\nokia_logo.png private\10008D39\localpages\nokia_logo.png /* From sf\mw\browser\bookmarksengine\browsercontentdll\browsercontentdll_template.pkg ***********************/ diff -r b0dd75e285d2 -r 0954f5dd2cd0 rom/rom.pro --- a/rom/rom.pro Fri May 14 15:40:36 2010 +0300 +++ b/rom/rom.pro Tue Jun 29 00:46:29 2010 -0400 @@ -1,9 +1,13 @@ TEMPLATE = subdirs SUBDIRS = -# Generate the rom iby file from the template.pkg files already generated by qmake +# Generate the rom iby file and the maemo debian install file +# from the template.pkg files already generated by qmake symbian { exists( $$PWD/../../../../brtools/platform/symbian/install/generate-rom-iby.bat ) { system($$PWD/../../../../brtools/platform/symbian/install/generate-rom-iby.bat) } + exists( $$PWD/../../../../brtools/platform/maemo/generate-debian-files.bat ) { + system($$PWD/../../../../brtools/platform/maemo/generate-debian-files.bat) + } }

'+ - ' '+ - '
'+ - ' '+ - '
'+ - ' '+ - '	'+ - ''+ - '

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

Functionality to Evaluate:

Known Limitations:

END OF RELEASE NOTES

Bedrock Browser
Alpha 3
Release Notes

Overview

About this Release

Target Platforms and Devices

Prerequisites

Functionality to Evaluate

Known Limitations

This Page Hangs

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

Functionality to Evaluate:

Known Limitations:

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

END OF RELEASE NOTES

Functionality to Evaluate:

Known Limitations:

END OF RELEASE NOTES

Ginebra 2 Test Page

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

Functionality to Evaluate:

Known Limitations:

END OF RELEASE NOTES

Bedrock BrowserAlpha 3Release Notes

Overview

About this Release

Target Platforms and Devices

Prerequisites

Functionality to Evaluate

Known Limitations

This Page Hangs

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

Functionality to Evaluate:

Known Limitations:

Overview of the Release:

Target Platforms/Devices:

Prerequisites:

END OF RELEASE NOTES

Functionality to Evaluate:

Known Limitations:

END OF RELEASE NOTES

Ginebra 2 Test Page

Bedrock Browser
Alpha 3
Release Notes