diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/emulator/browser.h --- a/ginebra2/emulator/browser.h Fri Jun 11 16:23:26 2010 +0100 +++ b/ginebra2/emulator/browser.h Thu Jul 22 16:30:16 2010 +0100 @@ -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