From bfeb3f45334426b092bc83f6ffc5a3ead561de14 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 12 Mar 2014 18:18:46 +0100
Subject: [PATCH] Save the work.

---
 src/gui/feedmessageviewer.cpp |  2 +-
 src/gui/formmain.cpp          | 10 +++++----
 src/gui/formmain.ui           | 42 +++++++++++++++++++++++++----------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 96facee9e..535611af7 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -259,7 +259,7 @@ void FeedMessageViewer::createConnections() {
           SIGNAL(triggered()), m_feedsView, SLOT(openSelectedFeedsInNewspaperMode()));
   connect(form_main->m_ui->m_actionDeleteSelectedFeedCategory,
           SIGNAL(triggered()), m_feedsView, SLOT(deleteSelectedItem()));
-  connect(form_main->m_ui->m_actionSwitchFeedsListVisibility,
+  connect(form_main->m_ui->m_actionSwitchFeedsList,
           SIGNAL(triggered()), this, SLOT(switchFeedComponentVisibility()));
   connect(form_main->m_ui->m_actionSelectNextFeedCategory,
           SIGNAL(triggered()), m_feedsView, SLOT(selectNextItem()));
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 8fb429f8d..97c8682c1 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -94,7 +94,7 @@ QList<QAction*> FormMain::allActions() {
   // Add basic actions.
   actions << m_ui->m_actionSettings << m_ui->m_actionQuit <<
              m_ui->m_actionFullscreen << m_ui->m_actionAboutGuard <<
-             m_ui->m_actionSwitchFeedsListVisibility << m_ui->m_actionSwitchMainWindow <<
+             m_ui->m_actionSwitchFeedsList << m_ui->m_actionSwitchMainWindow <<
              m_ui->m_actionSwitchMainMenu;
 
   // Add web browser actions
@@ -268,8 +268,9 @@ void FormMain::setupIcons() {
   // View.
   m_ui->m_actionSwitchMainWindow->setIcon(icon_theme_factory->fromTheme("view-switch"));
   m_ui->m_actionFullscreen->setIcon(icon_theme_factory->fromTheme("view-fullscreen"));
-  m_ui->m_actionSwitchFeedsListVisibility->setIcon(icon_theme_factory->fromTheme("view-switch"));
+  m_ui->m_actionSwitchFeedsList->setIcon(icon_theme_factory->fromTheme("view-switch"));
   m_ui->m_actionSwitchMainMenu->setIcon(icon_theme_factory->fromTheme("view-switch"));
+  m_ui->m_menuShowHide->setIcon(icon_theme_factory->fromTheme("view-switch"));
 
   // Web browser.
   m_ui->m_actionAddBrowser->setIcon(icon_theme_factory->fromTheme("list-add"));
@@ -333,7 +334,8 @@ void FormMain::loadSize() {
 
   // Hide the main menu if user wants it.
   if (!(m_mainMenuActivated = settings->value(APP_CFG_GUI, "main_menu_visible", true).toBool())) {
-    m_ui->m_menuBar->setVisible(false);
+    m_mainMenuActivated = !m_mainMenuActivated;
+    m_ui->m_actionSwitchMainMenu->setChecked(false);
   }
 
   // Adjust dimensions of "feeds & messages" widget.
@@ -368,7 +370,7 @@ void FormMain::createConnections() {
   // Menu "View" connections.
   connect(m_ui->m_actionFullscreen, SIGNAL(triggered()), this, SLOT(switchFullscreenMode()));
   connect(m_ui->m_actionSwitchMainWindow, SIGNAL(triggered()), this, SLOT(switchVisibility()));
-  connect(m_ui->m_actionSwitchMainMenu, SIGNAL(triggered()), this, SLOT(switchMainMenu()));
+  connect(m_ui->m_actionSwitchMainMenu, SIGNAL(toggled(bool)), this, SLOT(switchMainMenu()));
 
   // Menu "Tools" connections.
   connect(m_ui->m_actionSettings, SIGNAL(triggered()), this, SLOT(showSettings()));
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index d6cc4bde1..535f35135 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -48,7 +48,7 @@
      <x>0</x>
      <y>0</y>
      <width>979</width>
-     <height>19</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="m_menuFile">
@@ -68,10 +68,16 @@
     <property name="title">
      <string>&amp;View</string>
     </property>
-    <addaction name="m_actionFullscreen"/>
+    <widget class="QMenu" name="m_menuShowHide">
+     <property name="title">
+      <string>Show/hide</string>
+     </property>
+     <addaction name="m_actionSwitchFeedsList"/>
+     <addaction name="m_actionSwitchMainMenu"/>
+    </widget>
+    <addaction name="m_menuShowHide"/>
     <addaction name="m_actionSwitchMainWindow"/>
-    <addaction name="m_actionSwitchFeedsListVisibility"/>
-    <addaction name="m_actionSwitchMainMenu"/>
+    <addaction name="m_actionFullscreen"/>
    </widget>
    <widget class="QMenu" name="m_menuTools">
     <property name="title">
@@ -358,15 +364,15 @@
    </property>
   </action>
   <action name="m_actionSwitchMainWindow">
+   <property name="checked">
+    <bool>false</bool>
+   </property>
    <property name="text">
-    <string>Switch visibility of main &amp;window</string>
+    <string>Switch main &amp;window</string>
    </property>
    <property name="toolTip">
     <string>Hides main window if it is visible and shows it if it is hidden.</string>
    </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
   </action>
   <action name="m_actionDefragmentDatabase">
    <property name="text">
@@ -376,13 +382,19 @@
     <string>Defragment database file so that its size decreases.</string>
    </property>
   </action>
-  <action name="m_actionSwitchFeedsListVisibility">
+  <action name="m_actionSwitchFeedsList">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
-    <string>Switch &amp;feed list visibility</string>
+    <string>&amp;Feed list</string>
    </property>
    <property name="toolTip">
     <string>Hides or shows the list of feeds/categories.</string>
    </property>
+   <property name="shortcut">
+    <string>F</string>
+   </property>
   </action>
   <action name="m_actionClearAllFeeds">
    <property name="text">
@@ -436,14 +448,20 @@
    </property>
   </action>
   <action name="m_actionSwitchMainMenu">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
-    <string>Switch &amp;main menu visibility</string>
+    <string>&amp;Main menu</string>
    </property>
    <property name="toolTip">
     <string>Hides or displays the main menu.</string>
    </property>
    <property name="shortcut">
-    <string notr="true">M</string>
+    <string>M</string>
    </property>
   </action>
   <action name="m_actionWebEnableJavascript">