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

Fixed #67.

Browse Source
This commit is contained in:
Martin Rotter 2014-09-15 17:16:46 +02:00
parent 69cbd27b53
commit ddd76ecac8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/text/CHANGELOG
View File

@ -3,7 +3,7 @@
Fixed: Fixed:
<ul> <ul>
<li>Fixed bug #66.</li> <li>Fixed bug #66, #67.</li>
<li>Blau skin now has colored webkit scrollbars, fixed some button widths and enhanced menu popup tool buttons.</li> <li>Blau skin now has colored webkit scrollbars, fixed some button widths and enhanced menu popup tool buttons.</li>
</ul> </ul>

21
src/gui/formmain.cpp
View File

@ -151,11 +151,6 @@ void FormMain::prepareMenus() {
} }
} }
void FormMain::quit() {
qDebug("Quitting the application.");
qApp->quit();
}
void FormMain::switchFullscreenMode() { void FormMain::switchFullscreenMode() {
if (!isFullScreen()) { if (!isFullScreen()) {
showFullScreen(); showFullScreen();
@ -279,11 +274,13 @@ void FormMain::loadSize() {
m_ui->m_actionFullscreen->setChecked(true); m_ui->m_actionFullscreen->setChecked(true);
} }
// Hide the main menu if user wants it. if (settings->value(APP_CFG_GUI, "window_is_maximized", false).toBool()) {
if (!settings->value(APP_CFG_GUI, "main_menu_visible", true).toBool()) { setWindowState(windowState() | Qt::WindowMaximized);
m_ui->m_actionSwitchMainMenu->setChecked(false);
} }
// Hide the main menu if user wants it.
m_ui->m_actionSwitchMainMenu->setChecked(settings->value(APP_CFG_GUI, "main_menu_visible", true).toBool());
// Adjust dimensions of "feeds & messages" widget. // Adjust dimensions of "feeds & messages" widget.
m_ui->m_tabWidget->feedMessageViewer()->loadSize(); m_ui->m_tabWidget->feedMessageViewer()->loadSize();
m_ui->m_actionSwitchToolBars->setChecked(settings->value(APP_CFG_GUI, "enable_toolbars", true).toBool()); m_ui->m_actionSwitchToolBars->setChecked(settings->value(APP_CFG_GUI, "enable_toolbars", true).toBool());
@ -293,14 +290,20 @@ void FormMain::loadSize() {
void FormMain::saveSize() { void FormMain::saveSize() {
Settings *settings = qApp->settings(); Settings *settings = qApp->settings();
bool is_fullscreen = isFullScreen(); bool is_fullscreen = isFullScreen();
bool is_maximized = isMaximized();
if (is_fullscreen) { if (is_fullscreen) {
m_ui->m_actionFullscreen->setChecked(false); m_ui->m_actionFullscreen->setChecked(false);
} }
if (is_maximized) {
setWindowState(windowState() & ~Qt::WindowMaximized);
}
settings->setValue(APP_CFG_GUI, "main_menu_visible", m_ui->m_actionSwitchMainMenu->isChecked()); 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, "window_is_maximized", is_maximized);
settings->setValue(APP_CFG_GUI, "start_in_fullscreen", is_fullscreen); settings->setValue(APP_CFG_GUI, "start_in_fullscreen", is_fullscreen);
m_ui->m_tabWidget->feedMessageViewer()->saveSize(); m_ui->m_tabWidget->feedMessageViewer()->saveSize();
@ -314,7 +317,7 @@ void FormMain::createConnections() {
// Menu "File" connections. // Menu "File" connections.
connect(m_ui->m_actionExportFeeds, SIGNAL(triggered()), this, SLOT(exportFeeds())); connect(m_ui->m_actionExportFeeds, SIGNAL(triggered()), this, SLOT(exportFeeds()));
connect(m_ui->m_actionImportFeeds, SIGNAL(triggered()), this, SLOT(importFeeds())); connect(m_ui->m_actionImportFeeds, SIGNAL(triggered()), this, SLOT(importFeeds()));
connect(m_ui->m_actionQuit, SIGNAL(triggered()), this, SLOT(quit())); connect(m_ui->m_actionQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
// Menu "View" connections. // Menu "View" connections.
connect(m_ui->m_actionFullscreen, SIGNAL(toggled(bool)), this, SLOT(switchFullscreenMode())); connect(m_ui->m_actionFullscreen, SIGNAL(toggled(bool)), this, SLOT(switchFullscreenMode()));

3
src/gui/formmain.h
View File

@ -78,9 +78,6 @@ class FormMain : public QMainWindow {
void setupIcons(); void setupIcons();
public slots: public slots:
// Quits the application.
void quit();
// Displays window on top or switches its visibility. // Displays window on top or switches its visibility.
void display(); void display();