I have made the following changes intended for : CE:Apps / heliumreborn Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/6945 Thank You, Robin Burchell [This message was auto-generated] --- Request # 6945: Messages from BOSS: State: review at 2012-10-05T10:36:58 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:w00t:branches:CE:Apps / heliumreborn -> CE:Apps / heliumreborn changes files: -------------- --- heliumreborn.changes +++ heliumreborn.changes @@ -0,0 +1,11 @@ +* Fri Oct 5 2012 Robin Burchell <[email protected]> - 1.1.4 +- Fixes NEMO#319: Double tapping page-zoom works randomly (from Marko Gronbarj) +- Remove unused MainView & lots of other code (from Robin) +- Change imports to QtQuick 1.1 (from Robin) +- Split SSL dialog out and lazy load it (from Robin) +- Split LogbookSheet out and lazy load it (from Robin) +- Lazy load the page menu (from Robin) +- Remove home-grown ScrollDecorator (from Robin) +- Clean up how the URL bar functions a bit (from Robin) +- Remove a bunch of unused image resources (from Robin) + old: ---- heliumreborn-1.1.3.tar.bz2 new: ---- heliumreborn-1.1.4.tar.bz2 spec files: ----------- --- heliumreborn.spec +++ heliumreborn.spec @@ -9,7 +9,7 @@ # << macros Summary: Helium Mobile browser ported to MeeGo Qt Quick Components -Version: 1.1.3 +Version: 1.1.4 Release: 1 Group: System/Libraries License: LGPL v2.1 other changes: -------------- ++++++ heliumreborn-1.1.3.tar.bz2 -> heliumreborn-1.1.4.tar.bz2 --- HeliumReborn.pro +++ HeliumReborn.pro @@ -39,7 +39,6 @@ # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp \ src/Core.cpp \ - src/MainView.cpp \ src/Logbook.cpp \ src/FaviconImageProvider.cpp \ src/CoreDbHelper.cpp \ @@ -62,7 +61,6 @@ HEADERS += \ src/Core.h \ - src/MainView.h \ src/LogbookLinkItems.h \ src/Logbook.h \ src/LinkItem.h \ @@ -90,15 +88,9 @@ qml/HeliumReborn/FlickableWebView.qml \ qml/HeliumReborn/FieldText.qml \ qml/HeliumReborn/common/VScrollDropShadow.qml \ - qml/HeliumReborn/common/VHScrollDropShadow.qml \ qml/HeliumReborn/common/TopDropShadow.qml \ - qml/HeliumReborn/common/ToolTip.qml \ - qml/HeliumReborn/common/TemporaryMessageWithIcon.qml \ - qml/HeliumReborn/common/ScrollBar.qml \ - qml/HeliumReborn/common/HScrollDropShadow.qml \ qml/HeliumReborn/common/EmbossedButton.qml \ qml/HeliumReborn/common/BottomDropShadow.qml \ - qml/HeliumReborn/common/BarIcon.qml \ qml/HeliumReborn/common/Background.qml \ qml/HeliumReborn/LogbookViewComponents/TabButton.qml \ qml/HeliumReborn/LogbookViewComponents/TabBar.qml \ Binary files pics/addressbar-filling-16x31.png deleted --- pics/addressbar-filling-16x31.sci +++ pics/addressbar-filling-16x31.sci @@ -1,6 +0,0 @@ -border.left: 7 -border.top: 7 -border.bottom: 7 -border.right: 0 -source: addressbar-filling-16x31.png - Binary files pics/footer-10x60.png deleted --- pics/footer-10x60.sci +++ pics/footer-10x60.sci @@ -1,6 +0,0 @@ -border.left: 0 -border.top: 2 -border.bottom: 0 -border.right: 0 -source: footer-10x60.png - Binary files pics/header-10x60.png deleted --- pics/header-10x60.sci +++ pics/header-10x60.sci @@ -1,6 +0,0 @@ -border.left: 0 -border.top: 1 -border.bottom: 0 -border.right: 0 -source: header-10x60.png - Binary files pics/home2.png deleted Binary files pics/quit-30x30.png deleted Binary files pics/softshadow-left.png deleted --- pics/softshadow-left.sci +++ pics/softshadow-left.sci @@ -1,5 +0,0 @@ -border.left: 0 -border.top: 16 -border.bottom: 16 -border.right: 0 -source: softshadow-left.png Binary files pics/softshadow-right.png deleted --- pics/softshadow-right.sci +++ pics/softshadow-right.sci @@ -1,5 +0,0 @@ -border.left: 0 -border.top: 16 -border.bottom: 16 -border.right: 0 -source: softshadow-right.png Binary files pics/tip-center-bottom-99x50.png deleted Binary files pics/tip-center-left-50x99.png deleted Binary files pics/tip-center-right-50x99.png deleted Binary files pics/tip-center-top-99x50.png deleted Binary files pics/tooltip-bg-100x100.png deleted Binary files pics/tooltip-bg-trans-100x100.png deleted --- qml/HeliumReborn/FieldText.qml +++ qml/HeliumReborn/FieldText.qml @@ -24,184 +24,133 @@ import QtQuick 1.1 import com.nokia.meego 1.0 -Item { - id: fieldText - height: 32 - property string text: "" - property bool mouseGrabbed: false +// TextInput box in which the User types the URL +TextField { + id: textEdit + platformSipAttributes: SipAttributes { + actionKeyEnabled: true + actionKeyHighlighted: true + actionKeyLabel: "Go" + } + platformStyle: TextFieldStyle { paddingRight: defaultFavIcon.width + 32 ; paddingLeft:reloadIcon.width + 32; } + placeholderText: "Enter URL" + property bool loading: false signal editFinished - signal editAborted - signal editStarted signal reloadRequested signal stopRequested function updateFavIcon() { - //console.log("fieldText.setFavIcon()"); defaultFavIcon.opacity = 0; favIcon.opacity = 1; } function setDefaultFavIcon() { - //console.log("fieldText.setDefaultFavIcon()"); favIcon.opacity = 0; defaultFavIcon.opacity = 0.7; } - // Set the "fieldText" to "editingUrl" state, and emit the "editStarted" signal - function edit() { - if (!mouseGrabbed) { - fieldText.editStarted(); - fieldText.state = 'editingUrl'; - mouseGrabbed = true; - } - } - - // Emit the "editFinished" signal - function finishEdit() { - fieldText.state = ''; - fieldText.text = textEdit.text; - mouseGrabbed = false; - textEdit.selectAll(); - fieldText.editFinished(); - } - - // Set the "fieldText" to "<empty>" state, and emit the "editAborted" signal - function abortEdit() { - if (mouseGrabbed) { - mouseGrabbed = false; - textEdit.text = fieldText.text; - fieldText.state = ''; - textEdit.selectAll(); - } - fieldText.editAborted(); + Image { + id: favIcon + height: parent.height-16 + width: height + asynchronous: true; + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: 16 + opacity: 0; + source: "image://favicons/"+webView.url } - SipAttributes { - id:customSipAttributes - actionKeyEnabled: true - actionKeyHighlighted: true - actionKeyLabel: "Go" + Image { + id: defaultFavIcon + height: parent.height-16 + width: height + fillMode: Image.PreserveAspectFit + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: 16 + source: "qrc:/qmls/pics/default-favico-30x30.png" + opacity: 1 } - // TextInput box in which the User types the URL - TextField { - id: textEdit - - Binding { - target: textEdit - property: "text" - value: fieldText.text + Image { + id: reloadIcon + height: parent.height-16 + width: height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: 16 + source: "qrc:/qmls/pics/reload-30x30.png" + opacity: 0.7 + MouseArea { + anchors.fill: parent + onClicked: { textEdit.reloadRequested(); } + onPressed: { parent.opacity = 1; } + onReleased: { parent.opacity = 0.7; } } + } - Image { - id: favIcon - height: parent.height-16 - width: height - smooth: true; asynchronous: true; - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 16 - opacity: 0; - source: "image://favicons/"+webView.url + Image { + id: clearIcon + height: parent.height-16 + width: height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: 16 + source: "qrc:/qmls/pics/clear-30x30.png" + opacity: 0 + MouseArea { + anchors.fill: parent + onClicked: { textEdit.text = ''; } + onPressed: { parent.opacity = 1; } + onReleased: { parent.opacity = 0.7; } } - - Image { - id: defaultFavIcon - height: parent.height-16 - width: height - smooth: true - fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 16 - source: "qrc:/qmls/pics/default-favico-30x30.png" - opacity: 1 + } + Image { + id: stopIcon + height: parent.height-16 + width: height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: 16 + source: "qrc:/qmls/pics/stop-30x30.png" + opacity: 0 + MouseArea { + anchors.fill: parent + onClicked: { textEdit.stopRequested(); } + onPressed: { parent.opacity = 1; } + onReleased: { parent.opacity = 0.7; } } + } - Image { - id: reloadIcon - height: parent.height-16 - width: height - smooth: true - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 16 - source: "qrc:/qmls/pics/reload-30x30.png" - opacity: 0.7 - MouseArea { - anchors.fill: parent - onClicked: { fieldText.reloadRequested(); } - onPressed: { parent.opacity = 1; } - onReleased: { parent.opacity = 0.7; } - } - } + Keys.onEnterPressed: { + textEdit.editFinished(); + } + Keys.onReturnPressed: { + textEdit.editFinished(); + } - Image { - id: clearIcon - height: parent.height-16 - width: height - smooth: true - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 16 - source: "qrc:/qmls/pics/clear-30x30.png" - opacity: 0 - MouseArea { - anchors.fill: parent - onClicked: { textEdit.text = ''; } - onPressed: { parent.opacity = 1; } - onReleased: { parent.opacity = 0.7; } - } - } - Image { - id: stopIcon - height: parent.height-16 - width: height - smooth: true - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 16 - source: "qrc:/qmls/pics/stop-30x30.png" - opacity: 0 - MouseArea { - anchors.fill: parent - onClicked: { fieldText.stopRequested(); } - onPressed: { parent.opacity = 1; } - onReleased: { parent.opacity = 0.7; } - } - } + onFocusChanged: { + if (focus) + selectTimer.start() + } - platformSipAttributes:customSipAttributes - platformStyle: TextFieldStyle { paddingRight: defaultFavIcon.width + 32 ; paddingLeft:reloadIcon.width + 32; } - anchors.left: parent.left - anchors.leftMargin: 4 - anchors.right: parent.right - anchors.rightMargin: 4 - anchors.verticalCenter: parent.verticalCenter - font.family: "Helvetica" - font.bold: false - font.pixelSize: 18 - Keys.onEscapePressed: { abortEdit(); } - Keys.onEnterPressed: { finishEdit(); } - Keys.onReturnPressed: { finishEdit(); } - - placeholderText: "Enter URL" - - onActiveFocusChanged: { - if( textEdit.focus ) { - edit(); - } + // we must delay the selection on a timer, otherwise something else overwrites it + Timer { + id: selectTimer + interval: 1 + onTriggered: { + parent.selectAll() } - } - states: [ State { name: "editingUrl" + when: textEdit.focus PropertyChanges { target: clearIcon opacity: 0.7 @@ -217,16 +166,11 @@ PropertyChanges { target: textEdit readOnly: false - focus: true - } - StateChangeScript { - name: "selectAll" - script: { textEdit.selectAll(); } } }, State { name: "loadingUrl" - when: fieldText.loading + when: textEdit.loading PropertyChanges { target: clearIcon opacity: 0 @@ -242,7 +186,6 @@ } ] - transitions: [ Transition { from: "" --- qml/HeliumReborn/FlickableWebView.qml +++ qml/HeliumReborn/FlickableWebView.qml @@ -20,7 +20,6 @@ * */ -import Qt 4.7 import QtQuick 1.1 import QtWebKit 1.0 @@ -86,8 +85,8 @@ if(contentX<0 || contentY<0){ var sc = webView.contentsScale - if(webView.contentsScale*webView.contentsSize.width<flickable.width){ - sc=flickable.width/(webView.contentsSize.width/webView.contentsScale) + if(webView.contentsScale*webView.width<flickable.width){ + sc=flickable.width/(webView.width/webView.contentsScale) } var vx=Math.max(0,contentX)+(flickable.width/2) var vy=Math.max(0,contentY)+(flickable.height/2) @@ -107,7 +106,7 @@ // Set the URL for this WebView function setUrl(urlString) { this.url = appcore.fixUrl(urlString); } - //function setUrl(urlString) { this.url = urlString; } + // Execute the Zooming function doZoom(zoom,centerX,centerY) { @@ -136,7 +135,6 @@ } - //url:"http://www.connecting.nokia.com/"; url: { appcore.fixUrl(appcore.currentUrl); @@ -173,14 +171,17 @@ } } onDoubleClick: { - if (!heuristicZoom(clickX, clickY, 2.5)) { - - var zf = flickable.width / contentsSize.width; - if (zf >= contentsScale) { - zf = 2.0 // zoom in (else zooming out) - } + var zf=2.0 + // if zoomed go back to screen width + if(webView.contentsScale*webView.width>flickable.width){ + zf=flickable.width/(webView.width/webView.contentsScale) + doZoom(zf,clickX*zf,clickY*zf) + // try to do heuristic zoom with maximum 2.5x + }else if (!heuristicZoom(clickX, clickY, 2.5)) { + // if no heuristic zoom found, zoom to 2.0x doZoom(zf,clickX*zf,clickY*zf) } + } onIconChanged: { flickable.iconChanged(); } onLoadFinished: { if ( appcore ) { appcore.historyCurrentUrl(); } } --- qml/HeliumReborn/Header.qml +++ qml/HeliumReborn/Header.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "common" @@ -118,40 +118,21 @@ } - Item { - width: parent.width + FieldText { + id: fieldText + + onEditFinished: { header.urlChanged(fieldText.text); } + onReloadRequested: { webView.reload.trigger(); } + onStopRequested: { webView.stop.trigger(); } + anchors.top: headerText.bottom anchors.topMargin: 4 anchors.bottom: parent.bottom - - Item { - id: urlBox - height: fieldText.height+16 - anchors.left: parent.left - anchors.leftMargin: 10 - anchors.right: parent.right - anchors.rightMargin: 10 - clip: true - property bool mouseGrabbed: false - - z: 3 - - FieldText { - id: fieldText - mouseGrabbed: parent.mouseGrabbed - - onEditFinished: { header.urlChanged(fieldText.text); } - onReloadRequested: { webView.reload.trigger(); } - onStopRequested: { webView.stop.trigger(); } - - anchors.left: urlBox.left - anchors.right: urlBox.right - anchors.leftMargin: 6 - anchors.rightMargin: 6 - anchors.verticalCenter: urlBox.verticalCenter - anchors.verticalCenterOffset: 1 - } - } + anchors.bottomMargin: UiConstants.DefaultMargin + anchors.left: parent.left + anchors.right: parent.right + anchors.leftMargin: UiConstants.DefaultMargin + anchors.rightMargin: UiConstants.DefaultMargin BorderImage { source: "qrc:/qmls/pics/progressbar.png" @@ -160,11 +141,8 @@ border.left: 13 border.right: 0 anchors.left: parent.left - anchors.top: urlBox.top - anchors.leftMargin: 22 - anchors.topMargin: 0 - anchors.bottom: urlBox.bottom - anchors.bottomMargin: 0 + anchors.top: parent.top + anchors.bottom: parent.bottom width: (fieldText.width-24) * webView.progress @@ -174,7 +152,6 @@ opacity: 0.8-headerSkeleton.progressOff clip: true z:4 - } } --- qml/HeliumReborn/LogbookSheet.qml +++ qml/HeliumReborn/LogbookSheet.qml @@ -0,0 +1,10 @@ +import QtQuick 1.1 +import com.nokia.meego 1.0 + +Sheet { + id: logbookSheet + acceptButtonText: "Done" + content: LogbookView { + } +} + --- qml/HeliumReborn/LogbookView.qml +++ qml/HeliumReborn/LogbookView.qml @@ -25,7 +25,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "LogbookViewComponents" import "common" --- qml/HeliumReborn/LogbookViewComponents/BookmarksListView.qml +++ qml/HeliumReborn/LogbookViewComponents/BookmarksListView.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "../common" --- qml/HeliumReborn/LogbookViewComponents/Header.qml +++ qml/HeliumReborn/LogbookViewComponents/Header.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "../common" --- qml/HeliumReborn/LogbookViewComponents/HistoryListView.qml +++ qml/HeliumReborn/LogbookViewComponents/HistoryListView.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "../common" --- qml/HeliumReborn/LogbookViewComponents/LogbookListView.qml +++ qml/HeliumReborn/LogbookViewComponents/LogbookListView.qml @@ -20,7 +20,8 @@ * */ -import Qt 4.7 +import QtQuick 1.1 +import com.nokia.meego 1.1 import "../common" @@ -31,16 +32,8 @@ Background { anchors.fill: parent; z: -1; } - ScrollBar { - verticalOrientation: true - whenToShow: parent.moving - positionInContent: parent.visibleArea.yPosition - visibleContent: parent.visibleArea.heightRatio - width: 8 - anchors.top: parent.top - anchors.right: parent.right - anchors.bottom: parent.bottom - z: 2 + ScrollDecorator { + flickableItem: parent } VScrollDropShadow { --- qml/HeliumReborn/LogbookViewComponents/MostVisitedListView.qml +++ qml/HeliumReborn/LogbookViewComponents/MostVisitedListView.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "../common" --- qml/HeliumReborn/LogbookViewComponents/TabBar.qml +++ qml/HeliumReborn/LogbookViewComponents/TabBar.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 import "../common" --- qml/HeliumReborn/LogbookViewComponents/TabButton.qml +++ qml/HeliumReborn/LogbookViewComponents/TabButton.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Rectangle { id: tabButton --- qml/HeliumReborn/MainPage.qml +++ qml/HeliumReborn/MainPage.qml @@ -1,9 +1,55 @@ import QtQuick 1.1 import com.nokia.meego 1.0 +import com.nokia.extras 1.0 import "common" Page { - tools: commonTools + id: mainPage + tools: ToolBarLayout { + ToolIcon { + iconSource: "qrc:/qmls/pics/back-30x30.png" + onClicked: { mainPage.back(); } + } + + ToolIcon { + iconSource: "qrc:/qmls/pics/home-30x30.png" + onClicked: { if (appcore) appcore.loadHomeUrl(); } + + } + + ToolIcon { + iconSource: "qrc:/qmls/pics/forward-30x30.png" + onClicked: { mainPage.forward(); } + + } + + InfoBanner { + id: bookmarkAdded + text: "Bookmark added" + iconSource:"qrc:/qmls/pics/bookmark-icon-30x30.png" + } + + ToolIcon { + iconSource: "qrc:/qmls/pics/new-bookmark-30x30.png" + onClicked: { + bookmarkAdded.show(); + if (appcore) + appcore.bookmarkCurrentUrl(); + } + } + + ToolIcon { + iconSource: "qrc:/qmls/pics/bookmarks-30x30.png" + onClicked: { pageStack.openSheet(Qt.resolvedUrl("LogbookSheet.qml")) } + + } + + ToolIcon { + platformIconId: "toolbar-view-menu"; + anchors.right: parent===undefined ? undefined : parent.right + onClicked: pageStack.openDialog(Qt.resolvedUrl("MainPageMenu.qml")) + } + } function back() { webView.back.trigger(); @@ -37,35 +83,8 @@ z: 1 } - // Attach scrollbars to the right and bottom edges of the view. - ScrollBar { - id: verticalScrollBar - verticalOrientation: true - whenToShow: webView.moving - positionInContent: webView.visibleArea.yPosition - visibleContent: webView.visibleArea.heightRatio - width: 8 - anchors.top: parent.top - anchors.topMargin: header.height - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: 8 - z: 3 - } - - // Attach scrollbars to the right and bottom edges of the view. - ScrollBar { - id: horizontalScrollBar - verticalOrientation: false - whenToShow: webView.moving - positionInContent: webView.visibleArea.xPosition - visibleContent: webView.visibleArea.widthRatio - height: 8 - anchors.left: parent.left - anchors.right: parent.right - anchors.rightMargin: 8 - anchors.bottom: parent.bottom + ScrollDecorator { + flickableItem: webView z: 3 } - } --- qml/HeliumReborn/MainPageMenu.qml +++ qml/HeliumReborn/MainPageMenu.qml @@ -0,0 +1,24 @@ +import QtQuick 1.1 +import com.nokia.meego 1.1 + +Menu { + MenuLayout { + MenuItem { + text: qsTr("Clear history") + onClicked: { if (appcore) appcore.clearHistory(); } + } + MenuItem { + text: qsTr("Clear cookies") + onClicked: { if (appcore) appcore.clearCookies(); } + } + MenuItem { + text: qsTr("Clear bookmarks") + onClicked: { if (appcore) appcore.clearBookmarks(); } + } + MenuItem { + text: qsTr("Reset All") + onClicked: { if (appcore) appcore.resetAll(); } + } + } +} + --- qml/HeliumReborn/SslWarningDialog.qml +++ qml/HeliumReborn/SslWarningDialog.qml @@ -0,0 +1,42 @@ +import QtQuick 1.1 +import com.nokia.meego 1.0 + +Dialog { + id: warningDialog + property alias text: warningText.text + + title: Rectangle { + id: titleField + height: 2 + width: parent.width + color: "red" + } + + content:Item { + id: name + width: parent.width + height: 280 + Text { + id: warningText + width: parent.width + height: parent.height + font.pixelSize: 22 + anchors.centerIn: parent + color: "white" + text: "<b>SSL error</b>\n\nSite cannot be securely authenticated. \n\nReason:\n\n " + wrapMode:Text.WordWrap + + } + } + + buttons: ButtonRow { + style: ButtonStyle { } + anchors.horizontalCenter: parent.horizontalCenter + Button { + text: "Ok"; + onClicked: warningDialog.accept() + } + } + +} + --- qml/HeliumReborn/common/Background.qml +++ qml/HeliumReborn/common/Background.qml @@ -20,6 +20,6 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Rectangle { color: "#555"; z: -1; } --- qml/HeliumReborn/common/BarIcon.qml +++ qml/HeliumReborn/common/BarIcon.qml @@ -1,91 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : BarIcon.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -Item { - id: barIcon - - property string source: "" - property color highlightColor: "#fff" - property int hightlightBorderWidth: 0 - property color highlightBorderColor: "#fff" - property int badgeValue: 0 - property color badgeColor: "red" - - signal clicked() - - opacity: enabled ? 1 : 0.2 - - Image { - anchors.centerIn: parent - width: parent.height-30; height: parent.height-30; smooth: true; - source: parent.source - z: 2 - - Rectangle { - id: badge - enabled: barIcon.badgeValue > 0 - opacity: (barIcon.badgeValue > 0) ? 1 : 0 - anchors.horizontalCenter: parent.right - anchors.verticalCenter: parent.top - gradient: Gradient { - GradientStop { color: barIcon.badgeColor; position: 0;} - GradientStop { color: Qt.darker(barIcon.badgeColor); position: 1; } - } - width: 20; height: 20; - radius: 10; - Text { - id: badgeText - text: (barIcon.badgeValue > 9) ? " + " : barIcon.badgeValue; - anchors.centerIn: parent; color: "white"; - font.bold: true; font.pointSize: 12; - } -// effect: DropShadow { blurRadius: 20; offset.x: 0; offset.y: 0; } - } - } - - Rectangle { - id: highlight - anchors.fill: parent; - anchors.margins: 3 - color: parent.highlightColor - border.color: parent.highlightBorderColor - border.width: parent.hightlightBorderWidth - radius: 5 - opacity: 0 - z: 1 - } - - MouseArea { id: pressMouseArea; anchors.fill: parent; onClicked: { if (parent.enabled) parent.clicked(); } } - - states: [ - State { - name: "normal"; when: barIcon.enabled && !pressMouseArea.pressed; - PropertyChanges { target: highlight; opacity: 0; } - }, - State { - name: "pressed"; when: barIcon.enabled && pressMouseArea.pressed; - PropertyChanges { target: highlight; opacity: 0.2; } - } - ] -} --- qml/HeliumReborn/common/BottomDropShadow.qml +++ qml/HeliumReborn/common/BottomDropShadow.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Image { source: "qrc:/qmls/pics/softshadow-bottom.png" --- qml/HeliumReborn/common/EmbossedButton.qml +++ qml/HeliumReborn/common/EmbossedButton.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Rectangle { id: embossedButton --- qml/HeliumReborn/common/HScrollDropShadow.qml +++ qml/HeliumReborn/common/HScrollDropShadow.qml @@ -1,40 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : HScrollDropShadow.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -Item { - BorderImage { - source: "qrc:/qmls/pics/softshadow-left.sci" - x: -16 - y: -16 - width: 16 - height: parent.height+32 - } - BorderImage { - source: "qrc:/qmls/pics/softshadow-right.sci" - x: parent.width - y: -16 - width: 16 - height: parent.height+32 - } -} --- qml/HeliumReborn/common/ScrollBar.qml +++ qml/HeliumReborn/common/ScrollBar.qml @@ -1,67 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : ScrollBar.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -Item { - id: scrollBar - // The properties that define the scrollbar's state. - // positionInContent and visibleContent are in the range 0.0 - 1.0. They are relative to the - // height of the page, i.e. a visibleContent of 0.5 means that you can see 50% - // of the height of the view. - // The equation "positionInContent + visibleContent == 1" must be ALWAYS TRUE. - // orientation can be either 'Vertical' or 'Horizontal' - property real positionInContent - property real visibleContent - property bool verticalOrientation: true - property bool whenToShow: false - opacity: 0 - - // Size the bar to the required size, depending upon the orientation. - Rectangle { - opacity: parent.visibleContent < 1 ? 0.7 : 0 - color: "#555555" - border.width: 1 - border.color: "#cccccc" - radius: scrollBar.verticalOrientation ? (width/2 - 1) : (height/2 - 1) - x: scrollBar.verticalOrientation ? 1 : (scrollBar.positionInContent * (scrollBar.width-2) + 1) - y: scrollBar.verticalOrientation ? (scrollBar.positionInContent * (scrollBar.height-2) + 1) : 1 - width: scrollBar.verticalOrientation ? (scrollBar.width-2) : Math.max( height, (scrollBar.visibleContent * (scrollBar.width-2)) ) - height: scrollBar.verticalOrientation ? Math.max( width, (scrollBar.visibleContent * (scrollBar.height-2)) ) : (scrollBar.height-2) - } - - states: [ - State { - name: "ShowBars" - when: scrollBar.whenToShow - PropertyChanges { target: scrollBar; opacity: 1 } - } - ] - transitions: [ - Transition { - from: "*" - to: "ShowBars" - reversible: true - PropertyAnimation { property: "opacity"; duration: 200; } - } - ] -} --- qml/HeliumReborn/common/TemporaryMessageWithIcon.qml +++ qml/HeliumReborn/common/TemporaryMessageWithIcon.qml @@ -1,73 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : TemporaryMessageWithIcon.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -BorderImage { - id: temporaryMessageWithIcon - - property string title: "" - property string subTitle: "" - property string iconSource: "" - - function showAndDestroy() { - seqAnim.start(); - } - - source: "qrc:/qmls/pics/tooltip-bg-100x100.png" - border.top: 10 - border.bottom: 10 - border.left: 10 - border.right: 10 - - width: 350; height: 70; - anchors.centerIn: parent - opacity: 0; - z: 5 - - VHScrollDropShadow { anchors.fill: parent; anchors.margins: 4; z: -1 } - - Row { - anchors.centerIn: parent - spacing: 20 - Image { - source: iconSource - smooth: true; fillMode: Image.PreserveAspectFit; - anchors.verticalCenter: parent.verticalCenter - } - - Column { - anchors.verticalCenter: parent.verticalCenter - spacing: 5 - Text { text: title; font.pointSize: 18; font.bold: true; color: "#fff"; } - Text { text: subTitle; font.pointSize: 12; color: "#ccc"; width: 250; elide: Text.ElideRight; } - } - } - - SequentialAnimation { - id: seqAnim - PropertyAnimation { target: temporaryMessageWithIcon; property: "opacity"; duration: 300; to: 0.9; } - PauseAnimation { duration: 1000; } - PropertyAnimation { target: temporaryMessageWithIcon; property: "opacity"; duration: 300; to: 0; } - ScriptAction { script: temporaryMessageWithIcon.destroy(); } - } -} --- qml/HeliumReborn/common/ToolTip.qml +++ qml/HeliumReborn/common/ToolTip.qml @@ -1,134 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : ToolTip.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -BorderImage { - id: toolTip - z: 5 - - property variant attachTo - property int attachToMargin: 10 - property int orientation: 0 // '0' is 'North', '1' is 'East', '2' is 'South', '3' is 'West' - property bool transparent: false - property int marginsForChilds: 10 - enabled: true - opacity: 1 - - // Orientation == '0'(North) - anchors.top: (orientation == 0) ? attachTo.bottom : none - anchors.topMargin: (orientation == 0) ? attachToMargin : 0 - // Orientation == '1'(East) - anchors.right: (orientation == 1) ? attachTo.left: none - anchors.rightMargin: (orientation == 1) ? attachToMargin : 0 - // Orientation == '2'(South) - anchors.bottom: (orientation == 2) ? attachTo.top : none - anchors.bottomMargin: (orientation == 2) ? attachToMargin : 0 - // Orientation == '3'(West) - anchors.left: (orientation == 3) ? attachTo.right: none - anchors.leftMargin: (orientation == 3) ? attachToMargin : 0 - - // Orientation == '1'(East) or Orientation == '3'(West) - anchors.verticalCenter: (orientation == 1 || orientation == 3) ? attachTo.verticalCenter : none - // Orientation == '0'(North) or Orientation == '2'(South) - anchors.horizontalCenter: (orientation == 0 || orientation == 2) ? attachTo.horizontalCenter : undefined - - source: transparent ? "qrc:/qmls/pics/tooltip-bg-trans-100x100.png" : "qrc:/qmls/pics/tooltip-bg-100x100.png" - border.top: 10 - border.bottom: 10 - border.left: 10 - border.right: 10 - - Image { - source: (orientation == 0) ? "qrc:/qmls/pics/tip-center-top-99x50.png" : - (orientation == 1) ? "qrc:/qmls/pics/tip-center-right-50x99.png" : - (orientation == 2) ? "qrc:/qmls/pics/tip-center-bottom-99x50.png" : - "qrc:/qmls/pics/tip-center-left-50x99.png"; - - // Orientation == '1'(East) or Orientation == '3'(West) - anchors.verticalCenter: (parent.orientation == 1 || parent.orientation == 3) ? parent.verticalCenter : none - // Orientation == '0'(North) or Orientation == '2'(South) - anchors.horizontalCenter: (parent.orientation == 0 || parent.orientation == 2) ? parent.horizontalCenter : none - - // Orientation == '0'(North) - anchors.bottom: (parent.orientation == 0) ? parent.top : none - // Orientation == '1'(East) - anchors.left: (parent.orientation == 1) ? parent.right : none - // Orientation == '2'(South) - anchors.top: (parent.orientation == 2) ? parent.bottom : none - // Orientation == '3'(West) - anchors.right: (parent.orientation == 3) ? parent.left : none - - // Sizing based on Orientation - width: (parent.orientation == 0 || parent.orientation == 2) ? 60 : 30 - height: (parent.orientation == 0 || parent.orientation == 2) ? 30 : 60 - - smooth: true - } - -// effect: DropShadow { blurRadius: 20; offset.x: 0; offset.y: 0; } - - states: [ - State { - name: "disabled"; when: !toolTip.enabled; - PropertyChanges { - target: toolTip; - opacity: 0; - // Orientation == '0' - 'North' - anchors.topMargin: (toolTip.orientation == 0) ? -toolTip.attachToMargin : 0; - // Orientation == '1' - 'East' - anchors.rightMargin: (toolTip.orientation == 1) ? -toolTip.attachToMargin : 0; - // Orientation == '2' - 'South' - anchors.bottomMargin: (toolTip.orientation == 2) ? -toolTip.attachToMargin : 0; - // Orientation == '3' - 'West' - anchors.leftMargin: (toolTip.orientation == 3) ? -toolTip.attachToMargin : 0; - } - }, - State { - name: "enabled"; when: toolTip.enabled; - PropertyChanges { - target: toolTip; - opacity: 1; - // Orientation == '0' - 'North' - anchors.topMargin: (toolTip.orientation == 0) ? toolTip.attachToMargin : 0; - // Orientation == '1' - 'East' - anchors.rightMargin: (toolTip.orientation == 1) ? toolTip.attachToMargin : 0; - // Orientation == '2' - 'South' - anchors.bottomMargin: (toolTip.orientation == 2) ? toolTip.attachToMargin : 0; - // Orientation == '3' - 'West' - anchors.leftMargin: (toolTip.orientation == 3) ? toolTip.attachToMargin : 0; - } - } - ] - - transitions: [ - Transition { - from: "disabled"; to: "enabled"; reversible: true; - NumberAnimation { - target: toolTip; duration: 200; - properties: "opacity, anchors.topMargin, anchors.rightMargin, anchors.bottomMargin, anchors.leftMargin"; - } - } - ] - - onFocusChanged: { if ( !focus ) { enabled = false; } } -} --- qml/HeliumReborn/common/TopDropShadow.qml +++ qml/HeliumReborn/common/TopDropShadow.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Image { source: "qrc:/qmls/pics/softshadow-top.png" --- qml/HeliumReborn/common/VHScrollDropShadow.qml +++ qml/HeliumReborn/common/VHScrollDropShadow.qml @@ -1,54 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : VHScrollDropShadow.qml -* -* Created : 15 June 2011 -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -import Qt 4.7 - -Item { - BorderImage { - source: "qrc:/qmls/pics/softshadow-left.sci" - x: -16 - y: -16 - width: 16 - height: parent.height+32 - } - BorderImage { - source: "qrc:/qmls/pics/softshadow-right.sci" - x: parent.width - y: -16 - width: 16 - height: parent.height+32 - } - Image { - source: "qrc:/qmls/pics/softshadow-top.png" - x: 0 - y: -16 - width: parent.width - height: 16 - } - Image { - source: "qrc:/qmls/pics/softshadow-bottom.png" - x: 0 - y: parent.height - width: parent.width - height: 16 - } -} --- qml/HeliumReborn/common/VScrollDropShadow.qml +++ qml/HeliumReborn/common/VScrollDropShadow.qml @@ -20,7 +20,7 @@ * */ -import Qt 4.7 +import QtQuick 1.1 Item { Image { --- qml/HeliumReborn/main.qml +++ qml/HeliumReborn/main.qml @@ -1,139 +1,24 @@ import QtQuick 1.1 import com.nokia.meego 1.0 -import com.nokia.extras 1.0 PageStackWindow { id: appWindow + property bool errorDialogOpen - initialPage: mainPage - - Dialog { - id: warningDialog - - title: Rectangle { - id: titleField - height: 2 - width: parent.width - color: "red" - } - - content:Item { - id: name - width: parent.width - height: 280 - Text { - id: text - width: parent.width - height: parent.height - font.pixelSize: 22 - anchors.centerIn: parent - color: "white" - text: "<b>SSL error</b>\n\nSite cannot be securely authenticated. \n\nReason:\n\n " - wrapMode:Text.WordWrap - - } - } - - buttons: ButtonRow { - style: ButtonStyle { } - anchors.horizontalCenter: parent.horizontalCenter - Button { - text: "Ok"; - onClicked: warningDialog.accept() - } - } - - Connections { - target: appcore - onSslError: { - text.text="<b>SSL error</b><p>Site cannot be securely authenticated. <p>Error Message:<br>"+errorMsg; - warningDialog.open(); - } - } - - } - - InfoBanner { - id: bookmarkAdded - text: "Bookmark added" - iconSource:"qrc:/qmls/pics/bookmark-icon-30x30.png" - } - - Sheet { - id: logbookSheet - acceptButtonText: "Done" - content: LogbookView { - } - } - - MainPage { - id: mainPage - } - - ToolBarLayout { - id: commonTools - visible: true - - ToolIcon { - iconSource: "qrc:/qmls/pics/back-30x30.png" - onClicked: { mainPage.back(); } - } - - ToolIcon { - iconSource: "qrc:/qmls/pics/home-30x30.png" - onClicked: { if (appcore) appcore.loadHomeUrl(); } - - } - - ToolIcon { - iconSource: "qrc:/qmls/pics/forward-30x30.png" - onClicked: { mainPage.forward(); } - - } - - ToolIcon { - iconSource: "qrc:/qmls/pics/new-bookmark-30x30.png" - onClicked: { - bookmarkAdded.show(); - if (appcore) - appcore.bookmarkCurrentUrl(); - } - } - - ToolIcon { - iconSource: "qrc:/qmls/pics/bookmarks-30x30.png" - onClicked: { logbookSheet.open(); } - - } - - ToolIcon { - platformIconId: "toolbar-view-menu"; - id: menuIcon - anchors.right: parent===undefined ? undefined : parent.right - onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close() - } + initialPage: MainPage { } - Menu { - id: myMenu - visualParent: pageStack - MenuLayout { - MenuItem { - text: qsTr("Clear history") - onClicked: { if (appcore) appcore.clearHistory(); } - } - MenuItem { - text: qsTr("Clear cookies") - onClicked: { if (appcore) appcore.clearCookies(); } - } - MenuItem { - text: qsTr("Clear bookmarks") - onClicked: { if (appcore) appcore.clearBookmarks(); } - } - MenuItem { - text: qsTr("Reset All") - onClicked: { if (appcore) appcore.resetAll(); } - } + Connections { + target: appcore + onSslError: { + if (appWindow.errorDialogOpen) + return + + appWindow.errorDialogOpen = true + var dialog = pageStack.openDialog(Qt.resolvedUrl("SslWarningDialog.qml")) + dialog.text="<b>SSL error</b><p>Site cannot be securely authenticated. <p>Error Message:<br>"+errorMsg; + dialog.accepted.connect(function() { appWindow.errorDialogOpen = false }) + dialog.rejected.connect(function() { appWindow.errorDialogOpen = false }) } } } --- res.qrc +++ res.qrc @@ -1,7 +1,5 @@ <RCC> <qresource prefix="/qmls"> - <file>pics/addressbar-filling-16x31.png</file> - <file>pics/addressbar-filling-16x31.sci</file> <file>pics/back-30x30.png</file> <file>pics/bar-bg-10x80.png</file> <file>pics/bookmark-icon-30x30.png</file> @@ -11,49 +9,30 @@ <file>pics/clear-30x30.png</file> <file>pics/default-favico-30x30.png</file> <file>pics/embossed-button-overlay-62x62.png</file> - <file>pics/footer-10x60.png</file> - <file>pics/footer-10x60.sci</file> <file>pics/forward-30x30.png</file> - <file>pics/header-10x60.png</file> - <file>pics/header-10x60.sci</file> <file>pics/history-tabicon-30x30.png</file> <file>pics/home-30x30.png</file> <file>pics/home-icon-32x32.png</file> - <file>pics/home2.png</file> <file>pics/mostvisited-tabicon-30x30.png</file> <file>pics/new-bookmark-30x30.png</file> - <file>pics/quit-30x30.png</file> <file>pics/reload-30x30.png</file> <file>pics/softshadow-bottom.png</file> - <file>pics/softshadow-left.png</file> - <file>pics/softshadow-left.sci</file> - <file>pics/softshadow-right.png</file> - <file>pics/softshadow-right.sci</file> <file>pics/softshadow-top.png</file> <file>pics/stop-30x30.png</file> - <file>pics/tip-center-bottom-99x50.png</file> - <file>pics/tip-center-left-50x99.png</file> - <file>pics/tip-center-right-50x99.png</file> - <file>pics/tip-center-top-99x50.png</file> - <file>pics/tooltip-bg-100x100.png</file> - <file>pics/tooltip-bg-trans-100x100.png</file> <file>pics/url-list-bg-10x60.png</file> <file>qml/HeliumReborn/FieldText.qml</file> <file>qml/HeliumReborn/FlickableWebView.qml</file> <file>qml/HeliumReborn/Header.qml</file> <file>qml/HeliumReborn/LogbookView.qml</file> <file>qml/HeliumReborn/main.qml</file> + <file>qml/HeliumReborn/SslWarningDialog.qml</file> + <file>qml/HeliumReborn/LogbookSheet.qml</file> <file>qml/HeliumReborn/MainPage.qml</file> + <file>qml/HeliumReborn/MainPageMenu.qml</file> <file>qml/HeliumReborn/common/Background.qml</file> - <file>qml/HeliumReborn/common/BarIcon.qml</file> <file>qml/HeliumReborn/common/BottomDropShadow.qml</file> <file>qml/HeliumReborn/common/EmbossedButton.qml</file> - <file>qml/HeliumReborn/common/HScrollDropShadow.qml</file> - <file>qml/HeliumReborn/common/ScrollBar.qml</file> - <file>qml/HeliumReborn/common/TemporaryMessageWithIcon.qml</file> - <file>qml/HeliumReborn/common/ToolTip.qml</file> <file>qml/HeliumReborn/common/TopDropShadow.qml</file> - <file>qml/HeliumReborn/common/VHScrollDropShadow.qml</file> <file>qml/HeliumReborn/common/VScrollDropShadow.qml</file> <file>qml/HeliumReborn/LogbookViewComponents/BookmarksListView.qml</file> <file>qml/HeliumReborn/LogbookViewComponents/Header.qml</file> --- src/Core.h +++ src/Core.h @@ -36,9 +36,9 @@ #include <QSettings> #include <QNetworkReply> #include <QSslError> +#include <QDeclarativeView> #include "buildconfig.h" -#include "MainView.h" #include "WebViewInterface.h" #include "models/BookmarksListModel.h" #include "models/HistoryListModel.h" --- src/MainView.cpp +++ src/MainView.cpp @@ -1,29 +0,0 @@ -#include "MainView.h" - -#include "buildconfig.h" - -#include <QGLWidget> - -MainView::MainView(QWidget *parent) : - QDeclarativeView(parent) -{ - // Visual initialization -#ifdef USE_OPENGL - QGLFormat format = QGLFormat::defaultFormat(); - #ifdef Q_WS_MAC - format.setSampleBuffers(true); - #else - format.setSampleBuffers(false); - #endif - QGLWidget *glWidget = new QGLWidget(format, this); - setViewport(glWidget); - setViewportUpdateMode(QGraphicsView::FullViewportUpdate); -#else - setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); -#endif - - setAttribute(Qt::WA_OpaquePaintEvent); - setAttribute(Qt::WA_NoSystemBackground); - setResizeMode(QDeclarativeView::SizeRootObjectToView); - setFocus(); -} --- src/MainView.h +++ src/MainView.h @@ -1,39 +0,0 @@ -/*-------------------------------------------------------- -* Module Name : Helium Mobile Browser -* Version : 1.0 -* -* Software Name : Helium Mobile Browser -* Version : 1.0 -* -* Copyright (c) 2010 - 2011 France Telecom -* This software is distributed under the LGPL v2.1 license, -* the text of which is available at http://www.gnu.org/licenses/lgpl-2.1.html -* or see the "LICENSE.txt" file for more details. -* -*-------------------------------------------------------- -* File Name : MainView.h -* -* Created : 15 June 2011 -* -* Description : -* -* the main QDeclarativeView -* -*-------------------------------------------------------- -* 1.0 - First open source release -* -*/ - -#ifndef MAINVIEW_H -#define MAINVIEW_H - -#include <QDeclarativeView> - -class MainView : public QDeclarativeView -{ - Q_OBJECT -public: - MainView(QWidget *parent = 0); -}; - -#endif // MAINVIEW_H ++++++ heliumreborn.yaml --- heliumreborn.yaml +++ heliumreborn.yaml @@ -1,6 +1,6 @@ Name: heliumreborn Summary: Helium Mobile browser ported to MeeGo Qt Quick Components -Version: 1.1.3 +Version: 1.1.4 Release: 1 Group: System/Libraries License: LGPL v2.1
