From 96bef7054746142fb6f26605feefd6077e200938 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 13 Mar 2014 22:52:02 +0100 Subject: [PATCH] Added initial button-based main menu, some icons replaced. --- .../icons/mini-kfaenza/application-menu.png | Bin 0 -> 3663 bytes .../icons/mini-kfaenza/item-update-all.png | Bin 2258 -> 1536 bytes .../mini-kfaenza/item-update-selected.png | Bin 1938 -> 1536 bytes .../icons/mini-kfaenza/mail-mark-favorite.png | Bin 5971 -> 2210 bytes src/gui/formmain.cpp | 15 +----------- src/gui/formmain.h | 7 ------ src/gui/tabwidget.cpp | 22 ++++++++++++++++-- src/gui/tabwidget.h | 6 +++++ 8 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 resources/graphics/icons/mini-kfaenza/application-menu.png diff --git a/resources/graphics/icons/mini-kfaenza/application-menu.png b/resources/graphics/icons/mini-kfaenza/application-menu.png new file mode 100644 index 0000000000000000000000000000000000000000..d1f2b14d3c77794f5daceae7296e9432190b6293 GIT binary patch literal 3663 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≫dL4P-&&q{JGl)(6(*QpDU%b_i5X<|61*q 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 Y4dDCd;f?anbpQYW07*qoM6N<$f=C3QWdHyG diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-favorite.png b/resources/graphics/icons/mini-kfaenza/mail-mark-favorite.png index 72be51028fe5832b5b9c85ebc4a3337f98accc9b..98358cf217552fb7d711a137be92504dcdb77c1c 100644 GIT binary patch delta 2174 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 Au>b%7 literal 5971 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 m_ui->m_tabWidget->initializeTabs(); // Setup some appearance of the window. @@ -198,20 +199,6 @@ void FormMain::switchVisibility(bool force_hide) { } } -void FormMain::setApplicationMode(FormMain::ApplicationMode mode) { - switch (mode) { - case Tray: - - break; - - case SingleWindow: - break; - - default: - break; - } -} - void FormMain::display() { // Make sure window is not minimized. setWindowState(windowState() & ~Qt::WindowMinimized); diff --git a/src/gui/formmain.h b/src/gui/formmain.h index 0e36e7407..e87696ff9 100644 --- a/src/gui/formmain.h +++ b/src/gui/formmain.h @@ -35,11 +35,6 @@ class FormMain : public QMainWindow { friend class FeedsView; public: - enum ApplicationMode { - SingleWindow, - Tray - }; - // Constructors and destructors. explicit FormMain(QWidget *parent = 0); virtual ~FormMain(); @@ -97,8 +92,6 @@ class FormMain : public QMainWindow { // Switches visibility of main window. void switchVisibility(bool force_hide = false); - void setApplicationMode(ApplicationMode mode); - // Turns on/off fullscreen mode void switchFullscreenMode(); diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 7ff64a498..b85f064cf 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -23,17 +23,18 @@ #include "gui/tabbar.h" #include "gui/iconthemefactory.h" #include "gui/webbrowser.h" +#include "gui/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/cornerbutton.h" #include #include +#include TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent) { setTabBar(new TabBar(this)); setupCornerButton(); - //setTabsClosable(true); createConnections(); } @@ -47,6 +48,23 @@ void TabWidget::setupCornerButton() { setCornerWidget(m_cornerButton); } +void TabWidget::setupMainMenuButton() { + m_mainMenu = new QMenu("Main menu", this); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuFile); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuView); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuFeeds); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuMessages); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuTools); + m_mainMenu->addMenu(FormMain::instance()->m_ui->m_menuHelp); + + m_menuButton = new QToolButton(this); + m_menuButton->setAutoRaise(true); + m_menuButton->setIcon(IconThemeFactory::instance()->fromTheme("application-menu")); + m_menuButton->setPopupMode(QToolButton::InstantPopup); + m_menuButton->setMenu(m_mainMenu); + setCornerWidget(m_menuButton, Qt::TopLeftCorner); +} + void TabWidget::checkTabBarVisibility() { tabBar()->setVisible(count() > 1 || !Settings::instance()->value(APP_CFG_GUI, "hide_tabbar_one_tab", @@ -71,7 +89,7 @@ void TabWidget::createConnections() { connect(tabBar(), SIGNAL(currentChanged(int)), this, SLOT(fixContentAfterIndexChange(int))); } -void TabWidget::initializeTabs() { +void TabWidget::initializeTabs() { // Create widget for "Feeds" page and add it. m_feedMessageViewer = new FeedMessageViewer(this); int index_of_browser = addTab(static_cast(m_feedMessageViewer), diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h index 386b83962..f345ffe68 100644 --- a/src/gui/tabwidget.h +++ b/src/gui/tabwidget.h @@ -25,6 +25,8 @@ #include +class QMenu; +class QToolButton; class CornerButton; class Message; class FeedMessageViewer; @@ -61,6 +63,8 @@ class TabWidget : public QTabWidget { // of main "Feeds" widget. void initializeTabs(); + void setupMainMenuButton(); + // Sets up icons for this TabWidget. void setupIcons(); @@ -120,6 +124,8 @@ class TabWidget : public QTabWidget { private: CornerButton *m_cornerButton; + QToolButton *m_menuButton; + QMenu *m_mainMenu; FeedMessageViewer *m_feedMessageViewer; };