From 90bb67c654180d44487c674bef5fefa4ce81a7c5 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Fri, 4 May 2018 19:56:42 +0300 Subject: [PATCH] Add RSS/Log widgets to the QTabWidget on macOS Fixes commit a468c84b304bdcea985989ca987bda391e3ccaad --- src/gui/mainwindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a5daa6a15..0e9b3c3f0 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -679,7 +679,9 @@ void MainWindow::displayRSSTab(bool enable) if (!m_rssWidget) { m_rssWidget = new RSSWidget(m_tabs); connect(m_rssWidget.data(), &RSSWidget::unreadCountUpdated, this, &MainWindow::handleRSSUnreadCountUpdated); -#ifndef Q_OS_MAC +#ifdef Q_OS_MAC + m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount())); +#else const int indexTab = m_tabs->addTab(m_rssWidget, tr("RSS (%1)").arg(RSS::Session::instance()->rootFolder()->unreadCount())); m_tabs->setTabIcon(indexTab, GuiIconProvider::instance()->getIcon("application-rss+xml")); #endif @@ -1879,7 +1881,9 @@ void MainWindow::on_actionExecutionLogs_triggered(bool checked) if (checked) { Q_ASSERT(!m_executionLog); m_executionLog = new ExecutionLog(m_tabs, static_cast(executionLogMsgTypes())); -#ifndef Q_OS_MAC +#ifdef Q_OS_MAC + m_tabs->addTab(m_executionLog, tr("Execution Log")); +#else const int indexTab = m_tabs->addTab(m_executionLog, tr("Execution Log")); m_tabs->setTabIcon(indexTab, GuiIconProvider::instance()->getIcon("view-calendar-journal")); #endif