FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Main menu hiding fixes.

Browse Source
This commit is contained in:
Martin Rotter 2014-03-13 07:47:18 +01:00
parent a28a46b6d7
commit 6bbedcf703
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/text/CHANGELOG
View File

@ -3,6 +3,7 @@
Fixed: Fixed:
<ul> <ul>
<li>Simplified hiding of main menu - primarily in source code.</li>
<li>Fixed size of "normal" window display when fullscreen mode is active on application exit.</li> <li>Fixed size of "normal" window display when fullscreen mode is active on application exit.</li>
<li>Partially fixed bug #33.</li> <li>Partially fixed bug #33.</li>
<li>All datetimes fetched from feeds are now considered to be UTC.</li> <li>All datetimes fetched from feeds are now considered to be UTC.</li>

10
src/gui/formmain.cpp
View File

@ -46,7 +46,7 @@
FormMain *FormMain::s_instance; FormMain *FormMain::s_instance;
FormMain::FormMain(QWidget *parent) FormMain::FormMain(QWidget *parent)
: QMainWindow(parent), m_ui(new Ui::FormMain), m_mainMenuActivated(false) { : QMainWindow(parent), m_ui(new Ui::FormMain) {
m_ui->setupUi(this); m_ui->setupUi(this);
// Initialize singleton. // Initialize singleton.
@ -184,8 +184,7 @@ void FormMain::switchFullscreenMode() {
} }
void FormMain::switchMainMenu() { void FormMain::switchMainMenu() {
m_mainMenuActivated = !m_mainMenuActivated; m_ui->m_menuBar->setVisible(m_ui->m_actionSwitchMainMenu->isChecked());
m_ui->m_menuBar->setVisible(m_mainMenuActivated);
} }
void FormMain::switchVisibility() { void FormMain::switchVisibility() {
@ -333,8 +332,7 @@ void FormMain::loadSize() {
} }
// Hide the main menu if user wants it. // Hide the main menu if user wants it.
if (!(m_mainMenuActivated = settings->value(APP_CFG_GUI, "main_menu_visible", true).toBool())) { if (!settings->value(APP_CFG_GUI, "main_menu_visible", true).toBool()) {
m_mainMenuActivated = !m_mainMenuActivated;
m_ui->m_actionSwitchMainMenu->setChecked(false); m_ui->m_actionSwitchMainMenu->setChecked(false);
} }
@ -350,7 +348,7 @@ void FormMain::saveSize() {
m_ui->m_actionFullscreen->setChecked(false); m_ui->m_actionFullscreen->setChecked(false);
} }
settings->setValue(APP_CFG_GUI, "main_menu_visible", m_mainMenuActivated); settings->setValue(APP_CFG_GUI, "main_menu_visible", m_ui->m_actionSwitchMainMenu->isChecked());
settings->setValue(APP_CFG_GUI, "window_position", pos()); settings->setValue(APP_CFG_GUI, "window_position", pos());
settings->setValue(APP_CFG_GUI, "window_size", size()); settings->setValue(APP_CFG_GUI, "window_size", size());
settings->setValue(APP_CFG_GUI, "start_in_fullscreen", is_fullscreen); settings->setValue(APP_CFG_GUI, "start_in_fullscreen", is_fullscreen);

1
src/gui/formmain.h
View File

@ -118,7 +118,6 @@ class FormMain : public QMainWindow {
Ui::FormMain *m_ui; Ui::FormMain *m_ui;
QMenu *m_trayMenu; QMenu *m_trayMenu;
StatusBar *m_statusBar; StatusBar *m_statusBar;
bool m_mainMenuActivated;
static FormMain *s_instance; static FormMain *s_instance;
}; };

4
src/gui/formmain.ui
View File

@ -211,7 +211,7 @@
<string>Switch fullscreen mode.</string> <string>Switch fullscreen mode.</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string notr="true">Ctrl+Shift+F</string> <string notr="true">F</string>
</property> </property>
</action> </action>
<action name="m_actionAddBrowser"> <action name="m_actionAddBrowser">
@ -399,7 +399,7 @@
<string>Hides or shows the list of feeds/categories.</string> <string>Hides or shows the list of feeds/categories.</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>F</string> <string notr="true">L</string>
</property> </property>
</action> </action>
<action name="m_actionClearAllFeeds"> <action name="m_actionClearAllFeeds">