kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-08-03 20:56:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup with auxiliary local variables

Browse Source
This commit is contained in:
sgourdas 2024-07-23 14:03:46 +03:00 committed by Kelson
parent 68a7f4be8b
commit 1969fac0a4
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/kiwixapp.cpp
View File

@ -504,17 +504,18 @@ void KiwixApp::handleItemsState(TabType tabType)
{ {
auto libraryOrSettingsTab = (tabType == TabType::LibraryTab || tabType == TabType::SettingsTab); auto libraryOrSettingsTab = (tabType == TabType::LibraryTab || tabType == TabType::SettingsTab);
auto notBookmarkableTab = libraryOrSettingsTab || getTabWidget()->currentArticleUrl().isEmpty(); auto notBookmarkableTab = libraryOrSettingsTab || getTabWidget()->currentArticleUrl().isEmpty();
KiwixApp::instance()->getAction(KiwixApp::ToggleReadingListAction)->setDisabled(libraryOrSettingsTab); auto app = KiwixApp::instance();
KiwixApp::instance()->getAction(KiwixApp::ToggleAddBookmarkAction)->setDisabled(notBookmarkableTab); app->getAction(KiwixApp::ToggleReadingListAction)->setDisabled(libraryOrSettingsTab);
KiwixApp::instance()->getAction(KiwixApp::FindInPageAction)->setDisabled(libraryOrSettingsTab); app->getAction(KiwixApp::ToggleAddBookmarkAction)->setDisabled(notBookmarkableTab);
KiwixApp::instance()->getAction(KiwixApp::ZoomInAction)->setDisabled(libraryOrSettingsTab); app->getAction(KiwixApp::FindInPageAction)->setDisabled(libraryOrSettingsTab);
KiwixApp::instance()->getAction(KiwixApp::ZoomOutAction)->setDisabled(libraryOrSettingsTab); app->getAction(KiwixApp::ZoomInAction)->setDisabled(libraryOrSettingsTab);
KiwixApp::instance()->getAction(KiwixApp::ZoomResetAction)->setDisabled(libraryOrSettingsTab); app->getAction(KiwixApp::ZoomOutAction)->setDisabled(libraryOrSettingsTab);
KiwixApp::instance()->getAction(KiwixApp::RandomArticleAction)->setDisabled(libraryOrSettingsTab); app->getAction(KiwixApp::ZoomResetAction)->setDisabled(libraryOrSettingsTab);
app->getAction(KiwixApp::RandomArticleAction)->setDisabled(libraryOrSettingsTab);
/* Non-Zim tabs are not bookmarkable therefore never in reading list. */ /* Non-Zim tabs are not bookmarkable therefore never in reading list. */
if (notBookmarkableTab) if (notBookmarkableTab)
KiwixApp::instance()->getAction(KiwixApp::ToggleAddBookmarkAction)->setChecked(false); app->getAction(KiwixApp::ToggleAddBookmarkAction)->setChecked(false);
} }
void KiwixApp::updateNameMapper() void KiwixApp::updateNameMapper()

17
src/topwidget.cpp
View File

@ -16,14 +16,14 @@ TopWidget::TopWidget(QWidget *parent) :
auto app = KiwixApp::instance(); auto app = KiwixApp::instance();
QAction *back = app->getAction(KiwixApp::HistoryBackAction); QAction *back = app->getAction(KiwixApp::HistoryBackAction);
connect(back, &QAction::triggered, [](){ connect(back, &QAction::triggered, [app](){
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back); app->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back);
}); });
addAction(back); addAction(back);
QAction *forward = app->getAction(KiwixApp::HistoryForwardAction); QAction *forward = app->getAction(KiwixApp::HistoryForwardAction);
connect(forward, &QAction::triggered, [](){ connect(forward, &QAction::triggered, [app](){
KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward); app->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward);
}); });
addAction(forward); addAction(forward);
@ -42,11 +42,12 @@ TopWidget::TopWidget(QWidget *parent) :
addSeparator(); addSeparator();
addWidget(&m_searchEntry); addWidget(&m_searchEntry);
addAction(KiwixApp::instance()->getAction(KiwixApp::ToggleReadingListAction));
addAction(app->getAction(KiwixApp::ToggleReadingListAction));
addSeparator(); addSeparator();
addAction(KiwixApp::instance()->getAction(KiwixApp::OpenFileAction)); addAction(app->getAction(KiwixApp::OpenFileAction));
QMenu* menu = new MainMenu(); QMenu* menu = new MainMenu();
QToolButton *toolButton = new QToolButton(menu); QToolButton *toolButton = new QToolButton(menu);
@ -61,8 +62,8 @@ TopWidget::TopWidget(QWidget *parent) :
#if !SYSTEMTITLEBAR #if !SYSTEMTITLEBAR
addAction(QIcon(":/icons/minimize.svg"), "minimize", parent, SLOT(showMinimized())); addAction(QIcon(":/icons/minimize.svg"), "minimize", parent, SLOT(showMinimized()));
#endif #endif
addAction(KiwixApp::instance()->getAction(KiwixApp::ToggleFullscreenAction)); addAction(app->getAction(KiwixApp::ToggleFullscreenAction));
widgetForAction(KiwixApp::instance()->getAction(KiwixApp::ToggleFullscreenAction))->setObjectName("fullScreenButton"); widgetForAction(app->getAction(KiwixApp::ToggleFullscreenAction))->setObjectName("fullScreenButton");
#if !SYSTEMTITLEBAR #if !SYSTEMTITLEBAR
addAction(QIcon(":/icons/close.svg"), "close", parent, SLOT(close())); addAction(QIcon(":/icons/close.svg"), "close", parent, SLOT(close()));
#endif #endif