diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/ChromeView.h --- a/ginebra2/ChromeView.h Fri Jun 11 16:23:26 2010 +0100 +++ b/ginebra2/ChromeView.h Thu Jul 22 16:30:16 2010 +0100 @@ -1,50 +1,61 @@ /* * 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_CHROMEVIEW_H__ #define __GINEBRA_CHROMEVIEW_H__ #include +#ifdef ORBIT_UI +#include +#define ChromeGraphics HbMainWindow +#else +#define ChromeGraphics QGraphicsView +#endif // ORBIT_UI + namespace GVA { class ChromeWidget; -class ChromeView : public QGraphicsView +class ChromeView : public ChromeGraphics { Q_OBJECT public: - ChromeView(ChromeWidget * chrome, QWidget * parent = 0 ); + ChromeView(QGraphicsScene *graphicsScene, ChromeWidget * chrome, QWidget * parent = 0 ); ~ChromeView(); void resizeEvent(QResizeEvent * ev); bool event(QEvent* event); void scrollContentsBy(int dx, int dy); //protected: //bool eventFilter(QObject * obj, QEvent * ev); - + #ifdef Q_OS_SYMBIAN #ifdef SET_DEFAULT_IAP public slots: void setDefaultIap(); -#endif +#endif #endif private: QGraphicsWidget * m_topWidget; + ChromeWidget * m_chrome; //TODO: get rid of this }; -} +} #endif //__GINEBRA_CHROMEVIEW_H__