Commit faccb125 authored by Rinigus Saar's avatar Rinigus Saar

follow active state of bookmarks and history model

parent 55481249
...@@ -79,6 +79,9 @@ void BookmarksHistoryModel::onDatabaseChanged(const QString &table) ...@@ -79,6 +79,9 @@ void BookmarksHistoryModel::onDatabaseChanged(const QString &table)
void BookmarksHistoryModel::setQuery() void BookmarksHistoryModel::setQuery()
{ {
if (!m_active)
return;
QString command; QString command;
QString b = QStringLiteral("SELECT rowid AS id, url, title, icon, :now - lastVisited AS lastVisited, %1 AS bookmarked FROM %2 "); QString b = QStringLiteral("SELECT rowid AS id, url, title, icon, :now - lastVisited AS lastVisited, %1 AS bookmarked FROM %2 ");
QLatin1String filter = m_filter.isEmpty() ? QLatin1String() : QLatin1String("WHERE url LIKE '%' || :filter || '%' OR title LIKE '%' || :filter || '%'"); QLatin1String filter = m_filter.isEmpty() ? QLatin1String() : QLatin1String("WHERE url LIKE '%' || :filter || '%' OR title LIKE '%' || :filter || '%'");
......
...@@ -141,7 +141,6 @@ Controls.Drawer { ...@@ -141,7 +141,6 @@ Controls.Drawer {
onOpened: { onOpened: {
// check if the drawer was just slightly slided // check if the drawer was just slightly slided
if (openedState) return; if (openedState) return;
openedState = true;
urlInput.text = currentWebView.requestedUrl; urlInput.text = currentWebView.requestedUrl;
urlInput.forceActiveFocus(); urlInput.forceActiveFocus();
urlInput.selectAll(); urlInput.selectAll();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment