FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #604

This commit is contained in:
Martin Rotter 2022-01-29 16:31:19 +01:00
parent cdc8f3e42a
commit 5bd740cc4b
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/librssguard/gui/dialogs/formmain.cpp
View File

@ -45,6 +45,8 @@
#include <QScopedPointer>
#include <QThread>
#include <QTimer>
#include <QToolButton>
#include <QWidgetAction>
#if QT_VERSION >= 0x050E00 // Qt >= 5.14.0
#include <QScreen>
@ -62,6 +64,30 @@ FormMain::FormMain(QWidget* parent, Qt::WindowFlags f)
setWindowIcon(qApp->desktopAwareIcon());
setWindowTitle(QSL(APP_LONG_NAME));
QMenu* main_menu = new QMenu(tr("Main menu"), this);
main_menu->addMenu(m_ui->m_menuFile);
main_menu->addMenu(m_ui->m_menuView);
main_menu->addMenu(m_ui->m_menuAccounts);
main_menu->addMenu(m_ui->m_menuFeeds);
main_menu->addMenu(m_ui->m_menuMessages);
main_menu->addMenu(m_ui->m_menuWebBrowserTabs);
main_menu->addMenu(m_ui->m_menuTools);
main_menu->addMenu(m_ui->m_menuHelp);
QToolButton* btn_main_menu = new QToolButton(this);
btn_main_menu->setToolTip(tr("Open main menu"));
btn_main_menu->setMenu(main_menu);
btn_main_menu->setPopupMode(QToolButton::ToolButtonPopupMode::InstantPopup);
btn_main_menu->setIcon(qApp->icons()->fromTheme(QSL("go-home")));
m_actionToolbarMainMenu = new QWidgetAction(this);
m_actionToolbarMainMenu->setDefaultWidget(btn_main_menu);
m_actionToolbarMainMenu->setIcon(qApp->icons()->fromTheme(QSL("go-home")));
m_actionToolbarMainMenu->setText(tr("Open &main menu"));
m_actionToolbarMainMenu->setObjectName("m_actionToolbarMainMenu");
#if defined(USE_WEBENGINE)
m_ui->m_menuWebBrowserTabs->addAction(qApp->web()->adBlock()->adBlockIcon());
m_ui->m_menuWebBrowserTabs->addAction(qApp->web()->engineSettingsAction());
@ -203,6 +229,7 @@ QList<QAction*> FormMain::allActions() const {
actions << m_ui->m_actionTabsCloseCurrent;
actions << m_ui->m_actionTabsCloseAll;
actions << m_ui->m_actionTabsCloseAllExceptCurrent;
actions << m_actionToolbarMainMenu;
return actions;
}

2
src/librssguard/gui/dialogs/formmain.h
View File

@ -8,6 +8,7 @@
#include "ui_formmain.h"
class StatusBar;
class QWidgetAction;
class RSSGUARD_DLLSPEC FormMain : public QMainWindow {
Q_OBJECT
@ -81,6 +82,7 @@ class RSSGUARD_DLLSPEC FormMain : public QMainWindow {
QScopedPointer<Ui::FormMain> m_ui;
QMenu* m_trayMenu;
QWidgetAction* m_actionToolbarMainMenu;
StatusBar* m_statusBar;
};

1
src/librssguard/gui/tabwidget.cpp
View File

@ -41,6 +41,7 @@ void TabWidget::setupMainMenuButton() {
m_btnMainMenu->setToolTip(tr("Displays main menu."));
m_btnMainMenu->setIcon(qApp->icons()->fromTheme(QSL("go-home")));
m_btnMainMenu->setPopupMode(QToolButton::ToolButtonPopupMode::InstantPopup);
connect(m_btnMainMenu, &PlainToolButton::clicked, this, &TabWidget::openMainMenu);
}