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

Fullscreen fix.

Browse Source
This commit is contained in:
Martin Rotter 2014-03-13 07:28:37 +01:00
parent 359eaeb023
commit a28a46b6d7
3 changed files with 26 additions and 6 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:
<ul>
<li>Fixed size of "normal" window display when fullscreen mode is active on application exit.</li>
<li>Partially fixed bug #33.</li>
<li>All datetimes fetched from feeds are now considered to be UTC.</li>
</ul>

13
src/gui/formmain.cpp
View File

@ -142,7 +142,7 @@ void FormMain::prepareMenus() {
m_ui->m_actionCheckForUpdates->setToolTip(tr("Check if new update for the application is available for download."));
// Add needed items to the menu.
m_trayMenu->addAction(m_ui->m_actionSwitchMainWindow);
m_trayMenu->addAction(m_ui->m_actionSwitchMainWindowTray);
m_trayMenu->addSeparator();
m_trayMenu->addAction(m_ui->m_actionUpdateAllFeeds);
m_trayMenu->addAction(m_ui->m_actionMarkAllFeedsRead);
@ -329,7 +329,7 @@ void FormMain::loadSize() {
// If user exited the application while in fullsreen mode,
// then re-enable it now.
if (settings->value(APP_CFG_GUI, "start_in_fullscreen", false).toBool()) {
switchFullscreenMode();
m_ui->m_actionFullscreen->setChecked(true);
}
// Hide the main menu if user wants it.
@ -344,11 +344,16 @@ void FormMain::loadSize() {
void FormMain::saveSize() {
Settings *settings = Settings::instance();
bool is_fullscreen = isFullScreen();
if (is_fullscreen) {
m_ui->m_actionFullscreen->setChecked(false);
}
settings->setValue(APP_CFG_GUI, "main_menu_visible", m_mainMenuActivated);
settings->setValue(APP_CFG_GUI, "window_position", pos());
settings->setValue(APP_CFG_GUI, "window_size", size());
settings->setValue(APP_CFG_GUI, "start_in_fullscreen", isFullScreen());
settings->setValue(APP_CFG_GUI, "start_in_fullscreen", is_fullscreen);
m_ui->m_tabWidget->feedMessageViewer()->saveSize();
}
@ -368,7 +373,7 @@ void FormMain::createConnections() {
connect(m_ui->m_actionQuit, SIGNAL(triggered()), this, SLOT(quit()));
// Menu "View" connections.
connect(m_ui->m_actionFullscreen, SIGNAL(triggered()), this, SLOT(switchFullscreenMode()));
connect(m_ui->m_actionFullscreen, SIGNAL(toggled(bool)), this, SLOT(switchFullscreenMode()));
connect(m_ui->m_actionSwitchMainWindow, SIGNAL(triggered()), this, SLOT(switchVisibility()));
connect(m_ui->m_actionSwitchMainMenu, SIGNAL(toggled(bool)), this, SLOT(switchMainMenu()));

18
src/gui/formmain.ui
View File

@ -75,9 +75,9 @@
<addaction name="m_actionFullscreen"/>
<addaction name="m_actionSwitchFeedsList"/>
<addaction name="m_actionSwitchMainMenu"/>
<addaction name="m_actionSwitchMainWindow"/>
</widget>
<addaction name="m_menuShowHide"/>
<addaction name="m_actionSwitchMainWindow"/>
</widget>
<widget class="QMenu" name="m_menuTools">
<property name="title">
@ -367,11 +367,14 @@
</property>
</action>
<action name="m_actionSwitchMainWindow">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="text">
<string>Switch main &amp;window</string>
<string>Main &amp;window</string>
</property>
<property name="toolTip">
<string>Hides main window if it is visible and shows it if it is hidden.</string>
@ -491,6 +494,17 @@
<string>Auto-load &amp;images</string>
</property>
</action>
<action name="m_actionSwitchMainWindowTray">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Switch visibility of 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>
</action>
</widget>
<customwidgets>
<customwidget>