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

Merge branch 'Falkon/3.0'

Browse Source
This commit is contained in:
David Rosca 2018-04-29 13:16:42 +02:00
commit c15b112a4c
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autotests/qztoolstest.cpp
View File

@ -314,6 +314,7 @@ void QzToolsTest::copyRecursivelyTest()
QFile file(testDir + "-copy/dir1/dir1_2/file1.txt"); QFile file(testDir + "-copy/dir1/dir1_2/file1.txt");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QCOMPARE(file.readAll(), QByteArray("test")); QCOMPARE(file.readAll(), QByteArray("test"));
file.close();
// Copy to target that already exists // Copy to target that already exists
QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy"), false); QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy"), false);

16
src/plugins/VerticalTabs/tabtreeview.cpp
View File

@ -338,14 +338,14 @@ bool TabTreeView::viewportEvent(QEvent *event)
void TabTreeView::initView() void TabTreeView::initView()
{ {
// Restore expanded state // Restore expanded state
expandAll(); for (int i = 0; i < model()->rowCount(); ++i) {
QModelIndex index = model()->index(0, 0); const QModelIndex index = model()->index(i, 0);
while (index.isValid()) { reverseTraverse(index, [this](const QModelIndex &index) {
WebTab *tab = index.data(TabModel::WebTabRole).value<WebTab*>(); WebTab *tab = index.data(TabModel::WebTabRole).value<WebTab*>();
if (tab) { if (tab) {
setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool()); setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool());
} }
index = indexBelow(index); });
} }
m_initializing = false; m_initializing = false;

7
src/plugins/VerticalTabs/verticaltabsplugin.cpp
View File

@ -71,6 +71,9 @@ void VerticalTabsPlugin::init(InitState state, const QString &settingsPath)
const auto windows = mApp->windows(); const auto windows = mApp->windows();
for (BrowserWindow *window : windows) { for (BrowserWindow *window : windows) {
mainWindowCreated(window); mainWindowCreated(window);
if (window->sideBarManager()->activeSideBar().isEmpty()) {
window->sideBarManager()->showSideBar(QSL("VerticalTabs"));
}
} }
} }
} }
@ -187,9 +190,7 @@ QString VerticalTabsPlugin::styleSheet() const
void VerticalTabsPlugin::mainWindowCreated(BrowserWindow *window) void VerticalTabsPlugin::mainWindowCreated(BrowserWindow *window)
{ {
if (window->sideBarManager()->activeSideBar().isEmpty()) { Q_UNUSED(window)
window->sideBarManager()->showSideBar(QSL("VerticalTabs"));
}
setTabBarVisible(!m_replaceTabBar); setTabBarVisible(!m_replaceTabBar);
} }