Real tabs support for browser

.gitignore

@@ -1,2 +1,6 @@
 *~
 *.swp
+*.o
+*.moc
+moc_*.cpp
+*.qm

open-url.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Browser
+NotShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=sailfish-browser-ap-name
+X-MeeGo-Translation-Catalog=sailfish-browser
+MimeType=text/html;x-maemo-urischeme/http;x-maemo-urischeme/https;
+X-Maemo-Service=org.sailfishos.browser
+X-Maemo-Method=org.sailfishos.browser.openUrl

rpm/sailfish-browser.spec

@@ -11,7 +11,7 @@ BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Quick)
-BuildRequires:  pkgconfig(qt5embedwidget) >= 1.7.3
+BuildRequires:  pkgconfig(qt5embedwidget) >= 1.8.6
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Sql)
@@ -23,8 +23,8 @@ BuildRequires:  qt5-qttools-linguist
 BuildRequires:  gdb
 Requires: sailfishsilica-qt5 >= 0.11.8
 Requires: jolla-ambient >= 0.3.24
-Requires: xulrunner-qt5 >= 26.0.4.1
-Requires: embedlite-components-qt5 >= 1.3.11
+Requires: xulrunner-qt5 >= 29.0.1.4
+Requires: embedlite-components-qt5 >= 1.5.5
 Requires: sailfish-browser-settings = %{version}
 Requires: qt5-plugin-imageformat-ico
 Requires: qt5-plugin-imageformat-gif
@@ -105,6 +105,7 @@ rm -rf %{buildroot}
 # >> files
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/open-url.desktop
 %{_datadir}/%{name}/*
 %{_datadir}/translations/sailfish-browser_eng_en.qm
 %{_datadir}/dbus-1/services/*.service

sailfish-browser.desktop

@@ -4,8 +4,5 @@ Name=Web Browser
 X-MeeGo-Logical-Id=sailfish-browser-ap-name
 X-MeeGo-Translation-Catalog=sailfish-browser
 Icon=icon-launcher-browser
-Exec=invoker --type=silica-qt5 -s /usr/bin/sailfish-browser %U
+Exec=/usr/bin/sailfish-browser %U
 Comment=Sailfish UI application
-MimeType=text/html;x-maemo-urischeme/http;x-maemo-urischeme/https;
-X-Maemo-Service=org.sailfishos.browser
-X-Maemo-Method=org.sailfishos.browser.openUrl

sailfish-browser.pro

@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS += src tests settings
 
 # The .desktop file
-desktop.files = sailfish-browser.desktop
+desktop.files = sailfish-browser.desktop open-url.desktop
 desktop.path = /usr/share/applications
 
 dbus_service.files = org.sailfishos.browser.service

src/browser.qml

@@ -16,7 +16,7 @@ import "pages"
 ApplicationWindow {
     id: window
 
-    allowedOrientations: WebUtils.firstUseDone ? Orientation.Landscape | Orientation.Portrait  : Orientation.Portrait
+    allowedOrientations: WebUtils.firstUseDone ? Orientation.Landscape | Orientation.Portrait | Orientation.LandscapeInverted : Orientation.Portrait
     _defaultPageOrientations: allowedOrientations
     initialPage: Component {BrowserPage {}}
     cover: undefined

src/common.pri

@@ -0,0 +1,5 @@
+isEmpty(DEFAULT_COMPONENT_PATH) {
+  DEFINES += DEFAULT_COMPONENTS_PATH=\"\\\"/usr/lib/mozembedlite/\\\"\"
+} else {
+  DEFINES += DEFAULT_COMPONENTS_PATH=\"\\\"$$DEFAULT_COMPONENT_PATH\\\"\"
+}

src/dbmanager.cpp

@@ -38,7 +38,6 @@ DBManager::DBManager(QObject *parent)
     connect(worker, SIGNAL(tabsAvailable(QList<Tab>)), this, SLOT(tabListAvailable(QList<Tab>)));
     connect(worker, SIGNAL(historyAvailable(QList<Link>)), this, SIGNAL(historyAvailable(QList<Link>)));
     connect(worker, SIGNAL(tabHistoryAvailable(int,QList<Link>)), this, SIGNAL(tabHistoryAvailable(int,QList<Link>)));
-    connect(worker, SIGNAL(navigated(Tab)), this, SIGNAL(navigated(Tab)));
     connect(worker, SIGNAL(tabChanged(Tab)), this, SIGNAL(tabChanged(Tab)));
     connect(worker, SIGNAL(tabAvailable(Tab)), this, SIGNAL(tabAvailable(Tab)));
     connect(worker, SIGNAL(titleChanged(QString,QString)), this, SIGNAL(titleChanged(QString,QString)));
@@ -52,17 +51,23 @@ DBManager::DBManager(QObject *parent)
                               Q_RETURN_ARG(SettingsMap, m_settings));
 }
 
+int DBManager::getMaxTabId()
+{
+    return m_maxTabId;
+}
+
 int DBManager::createTab()
 {
     QMetaObject::invokeMethod(worker, "createTab", Qt::QueuedConnection, Q_ARG(int, ++m_maxTabId));
     return m_maxTabId;
 }
 
-int DBManager::createLink(int tabId, QString url)
+int DBManager::createLink(int tabId, QString url, QString title)
 {
     int linkId;
     QMetaObject::invokeMethod(worker, "createLink", Qt::BlockingQueuedConnection,
-                              Q_RETURN_ARG(int, linkId), Q_ARG(int, tabId), Q_ARG(QString, url));
+                              Q_RETURN_ARG(int, linkId), Q_ARG(int, tabId),
+                              Q_ARG(QString, url), Q_ARG(QString, title));
     return linkId;
 }
 
@@ -114,10 +119,10 @@ void DBManager::removeAllTabs()
     QMetaObject::invokeMethod(worker, "removeAllTabs", Qt::QueuedConnection);
 }
 
-void DBManager::updateTitle(QString url, QString title)
+void DBManager::updateTitle(int linkId, QString title)
 {
     QMetaObject::invokeMethod(worker, "updateTitle", Qt::QueuedConnection,
-                              Q_ARG(QString, url), Q_ARG(QString, title));
+                              Q_ARG(int, linkId), Q_ARG(QString, title));
 }
 
 void DBManager::updateThumbPath(QString url, QString path, int tabId)

src/dbmanager.h

@@ -28,7 +28,7 @@ class DBManager : public QObject
     static DBManager *instance();
 
     int createTab();
-    int createLink(int tabId, QString url);
+    int createLink(int tabId, QString url, QString title);
     void getTab(int tabId);
     void getAllTabs();
     void removeTab(int tabId);
@@ -39,7 +39,7 @@ class DBManager : public QObject
     void goBack(int tabId);
 
     void updateThumbPath(QString url, QString path, int tabId);
-    void updateTitle(QString url, QString title);
+    void updateTitle(int linkId, QString title);
 
     void clearHistory();
     void getHistory(const QString &filter = "");
@@ -50,11 +50,12 @@ class DBManager : public QObject
     QString getSetting(QString name);
     void deleteSetting(QString name);
 
+    int getMaxTabId();
+
 public slots:
     void tabListAvailable(QList<Tab> tabs);
 
 signals:
-    void navigated(Tab tab);
     void tabChanged(Tab tab);
     void tabAvailable(Tab tab);
     void tabsAvailable(QList<Tab> tab);
@@ -67,8 +68,6 @@ public slots:
 private:
     DBManager(QObject *parent = 0);
 
-    int getMaxTabId();
-
     int m_maxTabId;
     QMap<QString, QString> m_settings;
 

src/dbworker.cpp

@@ -128,13 +128,13 @@ void DBWorker::createTab(int tabId)
     execute(query);
 }
 
-int DBWorker::createLink(int tabId, QString url)
+int DBWorker::createLink(int tabId, QString url, QString title)
 {
     if (url.isEmpty()) {
         return 0;
     }
 
-    int linkId = createLink(url, "", "");
+    int linkId = createLink(url, title, "");
 
     if (!addToHistory(linkId)) {
         qWarning() << Q_FUNC_INFO << "failed to add url to history" << url;
@@ -246,7 +246,7 @@ void DBWorker::getTab(int tabId)
     if (query.first()) {
 #ifdef DEBUG_LOGS
         Tab tab = getTabData(query.value(0).toInt(), query.value(1).toInt());
-        qDebug() << query.value(0).toInt() << query.value(1).toInt() << tab.currentLink().title() << tab.currentLink().url();
+        qDebug() << query.value(0).toInt() << query.value(1).toInt() << tab.title() << tab.url();
 #endif
         emit tabAvailable(getTabData(query.value(0).toInt(), query.value(1).toInt()));
     }
@@ -323,7 +323,7 @@ void DBWorker::navigateTo(int tabId, QString url, QString title, QString path) {
 #ifdef DEBUG_LOGS
     qDebug() << "emit tab changed:" << tabId << historyId << title << url;
 #endif
-    emit navigated(getTabData(tabId, historyId));
+    emit tabChanged(getTabData(tabId, historyId));
 }
 
 void DBWorker::updateTab(int tabId, QString url, QString title, QString path)
@@ -618,13 +618,17 @@ void DBWorker::updateThumbPath(QString url, QString path, int tabId)
     }
 }
 
-void DBWorker::updateTitle(QString url, QString title)
+void DBWorker::updateTitle(int linkId, QString title)
 {
-    QSqlQuery query = prepare("UPDATE link SET title = ? WHERE url = ?;");
+    Link link = getLink(linkId);
+    QSqlQuery query = prepare("UPDATE link SET title = ? WHERE link_id = ?;");
     query.bindValue(0, title);
-    query.bindValue(1, url);
+    query.bindValue(1, linkId);
     if (execute(query)) {
-        emit titleChanged(url, title);
+        if (link.isValid() && link.title() != title) {
+            // For browsing history
+            emit titleChanged(link.url(), title);
+        }
     }
 }
 

src/dbworker.h

@@ -32,7 +32,7 @@ class DBWorker : public QObject
 public slots:
     void init();
     void createTab(int tabId);
-    int createLink(int tabId, QString url);
+    int createLink(int tabId, QString url, QString title);
     void removeTab(int tabId);
     void removeAllTabs();
     void getTab(int tabId);
@@ -41,7 +41,7 @@ public slots:
     void updateTab(int tabId, QString url, QString title, QString path);
     int getMaxTabId();
 
-    void updateTitle(QString url, QString title);
+    void updateTitle(int linkId, QString title);
     void updateThumbPath(QString url, QString path, int tabId);
 
     void goForward(int tabId);
@@ -58,7 +58,6 @@ public slots:
 signals:
     void tabAvailable(Tab tab);
     void tabChanged(Tab tab);
-    void navigated(Tab tab);
     void tabsAvailable(QList<Tab> tabs);
     void thumbPathChanged(QString url, QString path, int tabId);
     void titleChanged(QString url, QString title);