I have made the following changes intended for : CE:Apps:MTF / 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/4365 Thank You, vesku [This message was auto-generated] --- Request # 4365: Messages from BOSS: State: review at 2012-02-15T13:04:21 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:vesku:branches:CE:Apps:MTF / heliumreborn -> CE:Apps:MTF / heliumreborn changes files: -------------- --- heliumreborn.changes +++ heliumreborn.changes @@ -0,0 +1,5 @@ +* Wed Feb 15 2012 Vesa-Matti Hartikainen <[email protected]> - 1.1.2 +- Fixes NEMO#113: Browser doesn't support giving webpage from cmdline +- Release 1.1.2 +-- Sets window title for switcher + old: ---- heliumreborn-1.1.1.tar.bz2 new: ---- heliumreborn-1.1.2.tar.bz2 spec files: ----------- --- heliumreborn.spec +++ heliumreborn.spec @@ -7,11 +7,11 @@ Name: heliumreborn Summary: Helium Mobile browser ported to MeeGo Qt Quick Components -Version: 1.1.1 +Version: 1.1.2 Release: 1 Group: System/Libraries License: LGPL v2.1 -URL: https://github.com/veskuh/HeliumReborn +URL: https://github.com/nemomobile/heliumreborn Source0: %{name}-%{version}.tar.bz2 Source1: heliumreborn.desktop Source2: portrait.png other changes: -------------- ++++++ heliumreborn-1.1.1.tar.bz2 -> heliumreborn-1.1.2.tar.bz2 --- main.cpp +++ main.cpp @@ -8,11 +8,22 @@ QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create()); viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto); - Core *core = new Core(viewer->getView()); + Core *core; + if( app->arguments().length() > 1 ) { + core = new Core(viewer->getView(), app->arguments().last()); + } else { + core = new Core(viewer->getView()); + } + + viewer->getView()->setWindowTitle("HeliumReborn"); viewer->setMainQmlFile("qrc:/qmls/qml/HeliumReborn/main.qml"); - viewer->showExpanded(); core->start(); + viewer->showExpanded(); + + + + return app->exec(); } --- src/Core.cpp +++ src/Core.cpp @@ -25,7 +25,7 @@ #define LOGBOOKVIEW_QML "LogbookView.qml" // public: -Core::Core(QDeclarativeView *mainView, QObject *parent) : +Core::Core(QDeclarativeView *mainView, QString url, QObject *parent) : QObject(parent), m_mainView(mainView), m_WebViewInterface(NULL), @@ -98,7 +98,11 @@ m_mainView->engine()->addImageProvider("favicons", new FaviconImageProvider); // Load the Home URL - loadHomeUrl(); + if( url=="" ) { + loadHomeUrl(); + } else { + setCurrentUrl( fixUrl(url) ); + } } Core::~Core() { --- src/Core.h +++ src/Core.h @@ -52,7 +52,7 @@ Q_PROPERTY(QString currentUrl READ currentUrl WRITE setCurrentUrl NOTIFY currentUrlChanged) public: - Core(QDeclarativeView *mainView, QObject *parent = 0); + Core(QDeclarativeView *mainView, QString url="", QObject *parent = 0); virtual ~Core(); /** (Gentlemen,) Start THIS Engine */ ++++++ heliumreborn.desktop --- heliumreborn.desktop +++ heliumreborn.desktop @@ -7,3 +7,4 @@ Type=Application Terminal=false StartupNotify=true +MimeType=text/html ++++++ heliumreborn.yaml --- heliumreborn.yaml +++ heliumreborn.yaml @@ -1,10 +1,10 @@ Name: heliumreborn Summary: Helium Mobile browser ported to MeeGo Qt Quick Components -Version: 1.1.1 +Version: 1.1.2 Release: 1 Group: System/Libraries License: LGPL v2.1 -URL: https://github.com/veskuh/HeliumReborn +URL: https://github.com/nemomobile/heliumreborn Sources: - "%{name}-%{version}.tar.bz2" - heliumreborn.desktop
