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

Correctly handle the sideBar.

Browse Source 
The side bar has some constraints :
- If the contentManager is displayed, we cannot change or hide the side
  bar.
- The readingList button must follow the currentside bar, not its
  internal status (checked/unchecked).
This commit is contained in:
Matthieu Gautier 2018-12-10 16:40:42 +01:00
parent 6a0296f0f2
commit ce71fe0275
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/kiwixapp.cpp
View File

@ -181,6 +181,20 @@ void KiwixApp::setSideBar(KiwixApp::SideBarType type)
sideDockWidget->hide();
break;
}
m_currentSideType = type;
emit(currentSideTypeChanged(type));
}
void KiwixApp::toggleSideBar(KiwixApp::SideBarType type) {
if (m_currentSideType == type) {
setSideBar(NONE);
return;
}
if (m_currentSideType == CONTENTMANAGER_BAR) {
return;
}
setSideBar(type);
}
void KiwixApp::openRandomUrl(bool newTab)
@ -287,7 +301,7 @@ void KiwixApp::createAction()
CREATE_ACTION(FindInPageAction, tr("Find in page"));
SET_SHORTCUT(FindInPageAction, QKeySequence::Find);
connect(mpa_actions[FindInPageAction], &QAction::triggered,
this, [=]() { setSideBar(SEARCH_BAR); });
this, [=]() { toggleSideBar(SEARCH_BAR); });
CREATE_ACTION_ICON(ToggleFullscreenAction, "full-screen-enter", tr("Set fullScreen"));
SET_SHORTCUT(ToggleFullscreenAction, QKeySequence::FullScreen);
@ -306,15 +320,13 @@ void KiwixApp::createAction()
CREATE_ACTION_ICON(ToggleReadingListAction, "reading-list" ,tr("Reading list"));
SET_SHORTCUT(ToggleReadingListAction, QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_2));
connect(mpa_actions[ToggleReadingListAction], &QAction::toggled,
this, [=](bool checked) {
auto action = mpa_actions[ToggleReadingListAction];
action->setIcon(
QIcon(checked ? ":/icons/reading-list-active.svg" : ":/icons/reading-list.svg"));
setSideBar(checked ? READINGLIST_BAR : NONE);
connect(mpa_actions[ToggleReadingListAction], &QAction::triggered,
this, [=]() { toggleSideBar(READINGLIST_BAR); });
connect(this, &KiwixApp::currentSideTypeChanged,
this, [=](SideBarType type) {
mpa_actions[ToggleReadingListAction]->setIcon(
QIcon((type == READINGLIST_BAR) ? ":/icons/reading-list-active.svg" : ":/icons/reading-list.svg"));
});
mpa_actions[ToggleReadingListAction]->setCheckable(true);
CREATE_ACTION(ZoomInAction, tr("Zoom in"));
SET_SHORTCUT(ZoomInAction, QKeySequence::ZoomIn);

6
src/kiwixapp.h
View File

@ -17,6 +17,8 @@
class KiwixApp : public QApplication
{
Q_OBJECT
Q_PROPERTY(SideBarType currentSideType MEMBER m_currentSideType NOTIFY currentSideTypeChanged)
public:
enum Actions {
KiwixServeAction,
@ -74,12 +76,14 @@ public:
signals:
void currentTitleChanged(const QString& title);
void currentSideTypeChanged(SideBarType type);
public slots:
void openZimFile(const QString& zimfile="");
void openUrl(const QString& url, bool newTab=true);
void openUrl(const QUrl& url, bool newTab=true);
void setSideBar(SideBarType type);
void toggleSideBar(KiwixApp::SideBarType type);
void printPage();
protected:
@ -94,7 +98,7 @@ private:
ContentManager m_manager;
MainWindow* mp_mainWindow;
TabBar* mp_tabWidget;
QWidget* mp_currentSideBar;
SideBarType m_currentSideType;
QErrorMessage* mp_errorDialog;
QAction* mpa_actions[MAX_ACTION];