kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-29 15:53:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #340 from kiwix/dont-hide-sidebar

Browse Source 
Readinglist doesn't close automatically
This commit is contained in:
Kelson 2020-01-14 16:08:57 +01:00 committed by GitHub
commit bc9ddd1945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
kiwix-desktop rc5
=================
* Readinglist doesn't close automatically
kiwix-desktop rc4 kiwix-desktop rc4
================= =================

1
src/kiwixapp.h
View File

@ -77,6 +77,7 @@ public:
QString getLibraryDirectory() { return m_libraryDirectory; }; QString getLibraryDirectory() { return m_libraryDirectory; };
kiwix::KiwixServe* getLocalServer() { return mp_server; } kiwix::KiwixServe* getLocalServer() { return mp_server; }
SettingsManager* getSettingsManager() { return &m_settingsManager; }; SettingsManager* getSettingsManager() { return &m_settingsManager; };
SideBarType getSideType() { return m_currentSideType; }
bool isCurrentArticleBookmarked(); bool isCurrentArticleBookmarked();

2
src/tabbar.cpp
View File

@ -274,7 +274,9 @@ void TabBar::onCurrentChanged(int index)
emit webActionEnabledChanged(QWebEnginePage::Back, view->isWebActionEnabled(QWebEnginePage::Back)); emit webActionEnabledChanged(QWebEnginePage::Back, view->isWebActionEnabled(QWebEnginePage::Back));
emit webActionEnabledChanged(QWebEnginePage::Forward, view->isWebActionEnabled(QWebEnginePage::Forward)); emit webActionEnabledChanged(QWebEnginePage::Forward, view->isWebActionEnabled(QWebEnginePage::Forward));
emit libraryPageDisplayed(false); emit libraryPageDisplayed(false);
if (KiwixApp::instance()->getSideType() == KiwixApp::CONTENTMANAGER_BAR) {
KiwixApp::instance()->setSideBar(KiwixApp::NONE); KiwixApp::instance()->setSideBar(KiwixApp::NONE);
}
QTimer::singleShot(0, [=](){emit currentTitleChanged(view->title());}); QTimer::singleShot(0, [=](){emit currentTitleChanged(view->title());});
} else { } else {
emit webActionEnabledChanged(QWebEnginePage::Back, false); emit webActionEnabledChanged(QWebEnginePage::Back, false);