Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

BrowserWindow: Save sidebar for each window

Browse Source 
Allows to have different sidebar on each window.
This commit is contained in:
David Rosca 2018-01-02 18:42:40 +01:00
parent 1de32182c1
commit 1aa4b41151
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/app/browserwindow.cpp
View File

@ -375,7 +375,8 @@ void BrowserWindow::setupUi()
QSL("LocationBarWidth"),
QSL("WebSearchBarWidth"),
QSL("SideBarWidth"),
QSL("WebViewWidth")
QSL("WebViewWidth"),
QSL("SideBar")
};
for (const QString &key : keys) {
if (settings.contains(key)) {
@ -532,13 +533,14 @@ void BrowserWindow::createEncodingSubMenu(const QString &name, QStringList &code
QHash<QString, QVariant> BrowserWindow::saveUiState()
{
saveSideBarWidth();
saveSideBarSettings();
QHash<QString, QVariant> state;
state[QSL("LocationBarWidth")] = m_navigationToolbar->splitter()->sizes().at(0);
state[QSL("WebSearchBarWidth")] = m_navigationToolbar->splitter()->sizes().at(1);
state[QSL("SideBarWidth")] = m_sideBarWidth;
state[QSL("WebViewWidth")] = m_webViewWidth;
state[QSL("SideBar")] = m_sideBarManager->activeSideBar();
return state;
}
@ -550,6 +552,16 @@ void BrowserWindow::restoreUiState(const QHash<QString, QVariant> &state)
m_sideBarWidth = state.value(QSL("SideBarWidth"), 250).toInt();
m_webViewWidth = state.value(QSL("WebViewWidth"), 2000).toInt();
if (m_sideBar) {
m_mainSplitter->setSizes({m_sideBarWidth, m_webViewWidth});
}
const QString activeSideBar = state.value(QSL("SideBar")).toString();
if (activeSideBar.isEmpty() && m_sideBar) {
m_sideBar->close();
} else {
m_sideBarManager->showSideBar(activeSideBar, false);
}
}
void BrowserWindow::loadSettings()
@ -572,7 +584,6 @@ void BrowserWindow::loadSettings()
bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool();
bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool();
bool showMenuBar = settings.value("showMenubar", false).toBool();
const QString activeSideBar = settings.value("SideBar", "None").toString();
// Make sure both menubar and navigationbar are not hidden
// Fixes #781
@ -615,8 +626,6 @@ void BrowserWindow::loadSettings()
m_navigationToolbar->buttonForward()->setVisible(showBackForwardButtons);
m_navigationToolbar->webSearchBar()->setVisible(showWebSearchBar);
m_navigationToolbar->buttonAddTab()->setVisible(showAddTabButton);
m_sideBarManager->showSideBar(activeSideBar, false);
}
void BrowserWindow::goForward()
@ -833,23 +842,23 @@ SideBar* BrowserWindow::addSideBar()
m_mainSplitter->insertWidget(0, m_sideBar.data());
m_mainSplitter->setCollapsible(0, false);
m_mainSplitter->setSizes(QList<int>() << m_sideBarWidth << m_webViewWidth);
m_mainSplitter->setSizes({m_sideBarWidth, m_webViewWidth});
return m_sideBar.data();
}
void BrowserWindow::saveSideBarWidth()
void BrowserWindow::saveSideBarSettings()
{
if (!m_sideBar) {
return;
}
if (m_sideBar) {
// That +1 is important here, without it, the sidebar width would
// decrease by 1 pixel every close
m_sideBarWidth = m_mainSplitter->sizes().at(0) + 1;
m_webViewWidth = width() - m_sideBarWidth;
}
Settings().setValue(QSL("Browser-View-Settings/SideBar"), m_sideBarManager->activeSideBar());
}
void BrowserWindow::toggleShowMenubar()
{
#ifdef Q_OS_MACOS

2
src/lib/app/browserwindow.h
View File

@ -101,7 +101,7 @@ public:
void removeActions(const QList<QAction*> &actions);
SideBar* addSideBar();
void saveSideBarWidth();
void saveSideBarSettings();
TabbedWebView* weView() const;
TabbedWebView* weView(int index) const;

26
src/lib/sidebar/sidebar.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -92,6 +92,11 @@ SideBarManager::SideBarManager(BrowserWindow* parent)
{
}
QString SideBarManager::activeSideBar() const
{
return m_activeBar;
}
void SideBarManager::createMenu(QMenu* menu)
{
m_window->removeActions(menu->actions());
@ -145,7 +150,7 @@ void SideBarManager::slotShowSideBar()
void SideBarManager::showSideBar(const QString &id, bool toggle)
{
if (id == QLatin1String("None")) {
if (id.isEmpty() || id == QL1S("None")) {
return;
}
@ -158,10 +163,8 @@ void SideBarManager::showSideBar(const QString &id, bool toggle)
return;
}
m_sideBar.data()->close();
m_activeBar = "None";
Settings settings;
settings.setValue("Browser-View-Settings/SideBar", m_activeBar);
m_activeBar.clear();
m_window->saveSideBarSettings();
return;
}
@ -183,9 +186,7 @@ void SideBarManager::showSideBar(const QString &id, bool toggle)
}
m_activeBar = id;
Settings settings;
settings.setValue("Browser-View-Settings/SideBar", m_activeBar);
m_window->saveSideBarSettings();
}
void SideBarManager::sideBarRemoved(const QString &id)
@ -201,10 +202,7 @@ void SideBarManager::closeSideBar()
if (mApp->isClosing()) {
return;
}
m_activeBar = "None";
Settings settings;
settings.setValue("Browser-View-Settings/SideBar", m_activeBar);
m_window->saveSideBarWidth();
m_activeBar.clear();
m_window->saveSideBarSettings();
}

4
src/lib/sidebar/sidebar.h
View File

@ -1,6 +1,6 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -60,6 +60,8 @@ class FALKON_EXPORT SideBarManager : public QObject
public:
explicit SideBarManager(BrowserWindow* parent);
QString activeSideBar() const;
void createMenu(QMenu* menu);
void showSideBar(const QString &id, bool toggle = true);