FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanupsss.

This commit is contained in:
Martin Rotter 2014-11-09 21:34:58 +01:00
parent d3b97ddf98
commit 7a68fcf713
3 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/formmain.cpp
View File

@ -284,26 +284,26 @@ void FormMain::loadSize() {
Settings *settings = qApp->settings();
// Reload main window size & position.
resize(settings->value(GROUP(GUI), "window_size", size()).toSize());
move(settings->value(GROUP(GUI), "window_position", screen.center() - rect().center()).toPoint());
resize(settings->value(GROUP(GUI), GUI::MainWindowInitialSize, size()).toSize());
move(settings->value(GROUP(GUI), GUI::MainWindowInitialPosition, screen.center() - rect().center()).toPoint());
// If user exited the application while in fullsreen mode,
// then re-enable it now.
if (settings->value(GROUP(GUI), "start_in_fullscreen", false).toBool()) {
if (settings->value(GROUP(GUI), SETTING(GUI::MainWindowStartsFullscreen)).toBool()) {
m_ui->m_actionFullscreen->setChecked(true);
}
if (settings->value(GROUP(GUI), "window_is_maximized", false).toBool()) {
if (settings->value(GROUP(GUI), SETTING(GUI::MainWindowStartsMaximized)).toBool()) {
setWindowState(windowState() | Qt::WindowMaximized);
}
// Hide the main menu if user wants it.
m_ui->m_actionSwitchMainMenu->setChecked(settings->value(GROUP(GUI), "main_menu_visible", true).toBool());
m_ui->m_actionSwitchMainMenu->setChecked(settings->value(GROUP(GUI), SETTING(GUI::MainMenuVisible)).toBool());
// Adjust dimensions of "feeds & messages" widget.
m_ui->m_tabWidget->feedMessageViewer()->loadSize();
m_ui->m_actionSwitchToolBars->setChecked(settings->value(GROUP(GUI), "enable_toolbars", true).toBool());
m_ui->m_actionSwitchListHeaders->setChecked(settings->value(GROUP(GUI), "enable_list_headers", true).toBool());
m_ui->m_actionSwitchToolBars->setChecked(settings->value(GROUP(GUI), SETTING(GUI::ToolbarsVisible)).toBool());
m_ui->m_actionSwitchListHeaders->setChecked(settings->value(GROUP(GUI), SETTING(GUI::ListHeadersVisible)).toBool());
}
void FormMain::saveSize() {
@ -319,11 +319,11 @@ void FormMain::saveSize() {
setWindowState(windowState() & ~Qt::WindowMaximized);
}
settings->setValue(GROUP(GUI), "main_menu_visible", m_ui->m_actionSwitchMainMenu->isChecked());
settings->setValue(GROUP(GUI), "window_position", pos());
settings->setValue(GROUP(GUI), "window_size", size());
settings->setValue(GROUP(GUI), "window_is_maximized", is_maximized);
settings->setValue(GROUP(GUI), "start_in_fullscreen", is_fullscreen);
settings->setValue(GROUP(GUI), GUI::MainMenuVisible, m_ui->m_actionSwitchMainMenu->isChecked());
settings->setValue(GROUP(GUI), GUI::MainWindowInitialPosition, pos());
settings->setValue(GROUP(GUI), GUI::MainWindowInitialSize, size());
settings->setValue(GROUP(GUI), GUI::MainWindowStartsMaximized, is_maximized);
settings->setValue(GROUP(GUI), GUI::MainWindowStartsFullscreen, is_fullscreen);
m_ui->m_tabWidget->feedMessageViewer()->saveSize();
}
@ -416,7 +416,7 @@ void FormMain::changeEvent(QEvent *event) {
case QEvent::WindowStateChange: {
if (this->windowState() & Qt::WindowMinimized &&
SystemTrayIcon::isSystemTrayActivated() &&
qApp->settings()->value(GROUP(GUI), "hide_when_minimized", false).toBool()) {
qApp->settings()->value(GROUP(GUI), SETTING(GUI::HideMainWindowWhenMinimized)).toBool()) {
event->ignore();
QTimer::singleShot(CHANGE_EVENT_DELAY, this, SLOT(switchVisibility()));
}

21
src/miscellaneous/settings.cpp
View File

@ -71,6 +71,27 @@ DVALUE(Qt::ToolButtonStyle) GUI::ToolbarStyleDef = Qt::ToolButtonIconOnly;
DKEY GUI::FeedsToolbarActions = "feeds_toolbar";
DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllFeeds,m_actionMarkAllFeedsRead";
DKEY GUI::MainWindowInitialSize = "window_size";
DKEY GUI::MainWindowInitialPosition = "window_position";
DKEY GUI::MainWindowStartsFullscreen = "start_in_fullscreen";
DVALUE(bool) GUI::MainWindowStartsFullscreenDef = false;
DKEY GUI::MainWindowStartsMaximized = "window_is_maximized";
DVALUE(bool) GUI::MainWindowStartsMaximizedDef = false;
DKEY GUI::MainMenuVisible = "main_menu_visible";
DVALUE(bool) GUI::MainMenuVisibleDef = true;
DKEY GUI::ToolbarsVisible = "enable_toolbars";
DVALUE(bool) GUI::ToolbarsVisibleDef = true;
DKEY GUI::ListHeadersVisible = "enable_list_headers";
DVALUE(bool) GUI::ListHeadersVisibleDef = true;
DKEY GUI::HideMainWindowWhenMinimized = "hide_when_minimized";
DVALUE(bool) GUI::HideMainWindowWhenMinimizedDef = false;
// General.
DKEY General::ID = "main";

21
src/miscellaneous/settings.h
View File

@ -81,6 +81,27 @@ namespace GUI {
KEY FeedsToolbarActions;
VALUE(char*) FeedsToolbarActionsDef;
KEY MainWindowInitialSize;
KEY MainWindowInitialPosition;
KEY MainWindowStartsFullscreen;
VALUE(bool) MainWindowStartsFullscreenDef;
KEY MainWindowStartsMaximized;
VALUE(bool) MainWindowStartsMaximizedDef;
KEY MainMenuVisible;
VALUE(bool) MainMenuVisibleDef;
KEY ToolbarsVisible;
VALUE(bool) ToolbarsVisibleDef;
KEY ListHeadersVisible;
VALUE(bool) ListHeadersVisibleDef;
KEY HideMainWindowWhenMinimized;
VALUE(bool) HideMainWindowWhenMinimizedDef;
}
// General.