Added initial button-based main menu, some icons replaced.

src/gui/formmain.cpp

@@ -70,6 +70,7 @@ FormMain::FormMain(QWidget *parent)
   addActions(allActions());
 
   // Prepare tabs.
+  m_ui->m_tabWidget->setupMainMenuButton();
   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);

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();
 

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 <QUrl>
 #include <QApplication>
+#include <QMenu>
 
 
 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<TabContent*>(m_feedMessageViewer),

src/gui/tabwidget.h

@@ -25,6 +25,8 @@
 #include <QUrl>
 
 
+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;
 };