Mercurial > octave
changeset 27613:deb8877f2c34
use symbolic constants for preferences key and default values in news reader
* gui-preferences-all.h: added new include file for news reader
* main-window.cc: include new include file for news reader
(main_window, load_and_display_community_news): use symbolic constants
for news reader preferences
* module.mk: added new include file for news reader
* news-reader.cc: include new include file for news reader
(process): use symbolic constants for news reader preferences
* settings-dialog.cc (settings_dialog, write_changed_settings):
use symbolic constants for news reader preferences
* welcome-wizard.cc (handle_web_connect_option):
use symbolic constants for news reader preferences;
(setup_community_news): use default value for presetting the checkbox
for internet connection
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sat, 02 Nov 2019 07:41:42 +0100 |
| parents | 62236e51a8c6 |
| children | 8437248a4b17 |
| files | libgui/src/gui-preferences-all.h libgui/src/main-window.cc libgui/src/module.mk libgui/src/news-reader.cc libgui/src/settings-dialog.cc libgui/src/welcome-wizard.cc |
| diffstat | 6 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/gui-preferences-all.h Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/gui-preferences-all.h Sat Nov 02 07:41:42 2019 +0100 @@ -28,6 +28,7 @@ #include "gui-preferences-fb.h" #include "gui-preferences-global.h" #include "gui-preferences-mw.h" +#include "gui-preferences-nr.h" #include "gui-preferences-pd.h" #include "gui-preferences-ve.h" #include "gui-preferences-sc.h"
--- a/libgui/src/main-window.cc Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/main-window.cc Sat Nov 02 07:41:42 2019 +0100 @@ -57,6 +57,7 @@ #include "gui-preferences-ed.h" #include "gui-preferences-global.h" #include "gui-preferences-mw.h" +#include "gui-preferences-nr.h" #include "gui-settings.h" #include "interpreter-qobject.h" #include "main-window.h" @@ -185,12 +186,13 @@ if (settings) { connect_to_web - = settings->value ("news/allow_web_connection", false).toBool (); + = settings->value (nr_allow_connection.key, + nr_allow_connection.def).toBool (); last_checked - = settings->value ("news/last_time_checked", QDateTime ()).toDateTime (); - - serial = settings->value ("news/last_news_item", 0).toInt (); + = settings->value (nr_last_time.key, nr_last_time.def).toDateTime (); + + serial = settings->value (nr_last_news.key, nr_last_news.def).toInt (); m_default_encoding = settings->value (ed_default_enc.key, ed_default_enc.def).toString (); } @@ -663,7 +665,8 @@ bool connect_to_web = (settings - ? settings->value ("news/allow_web_connection", false).toBool () + ? settings->value (nr_allow_connection.key, + nr_allow_connection.def).toBool () : true); QString base_url = "https://octave.org";
--- a/libgui/src/module.mk Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/module.mk Sat Nov 02 07:41:42 2019 +0100 @@ -193,6 +193,7 @@ %reldir%/gui-preferences-fb.h \ %reldir%/gui-preferences-global.h \ %reldir%/gui-preferences-mw.h \ + %reldir%/gui-preferences-nr.h \ %reldir%/gui-preferences-pd.h \ %reldir%/gui-preferences-sc.h \ %reldir%/gui-preferences-ve.h \
--- a/libgui/src/news-reader.cc Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/news-reader.cc Sat Nov 02 07:41:42 2019 +0100 @@ -32,6 +32,7 @@ #include "news-reader.h" #include "resource-manager.h" +#include "gui-preferences-nr.h" #include "url-transfer.h" #include "version.h" @@ -69,7 +70,7 @@ if (settings) { - settings->setValue ("news/last_time_checked", + settings->setValue (nr_last_time.key, QDateTime::currentDateTime ()); settings->sync (); @@ -93,7 +94,7 @@ { if (settings) { - settings->setValue ("news/last_news_item", + settings->setValue (nr_last_news.key, curr_page_serial); settings->sync ();
--- a/libgui/src/settings-dialog.cc Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/settings-dialog.cc Sat Nov 02 07:41:42 2019 +0100 @@ -402,7 +402,7 @@ le_file_browser_extensions->setText (settings->value (fb_txt_file_ext.key, fb_txt_file_ext.def).toString ()); - checkbox_allow_web_connect->setChecked (settings->value ("news/allow_web_connection", false).toBool ()); + checkbox_allow_web_connect->setChecked (settings->value (nr_allow_connection.key, nr_allow_connection.def).toBool ()); useProxyServer->setChecked (settings->value ("useProxyServer", false).toBool ()); proxyHostName->setText (settings->value ("proxyHostName").toString ()); @@ -944,7 +944,7 @@ settings->setValue (fb_startup_dir.key, le_file_browser_dir->text ()); settings->setValue (fb_txt_file_ext.key, le_file_browser_extensions->text ()); - settings->setValue ("news/allow_web_connection", checkbox_allow_web_connect->isChecked ()); + settings->setValue (nr_allow_connection.key, checkbox_allow_web_connect->isChecked ()); settings->setValue ("useProxyServer", useProxyServer->isChecked ()); settings->setValue ("proxyType", proxyType->currentText ()); settings->setValue ("proxyHostName", proxyHostName->text ());
--- a/libgui/src/welcome-wizard.cc Fri Nov 01 18:29:47 2019 -0400 +++ b/libgui/src/welcome-wizard.cc Sat Nov 02 07:41:42 2019 +0100 @@ -38,6 +38,7 @@ #include "resource-manager.h" #include "welcome-wizard.h" +#include "gui-preferences-nr.h" namespace octave { @@ -145,7 +146,7 @@ if (settings) { - settings->setValue ("news/allow_web_connection", + settings->setValue (nr_allow_connection.key, m_allow_web_connect_state); settings->sync (); @@ -249,9 +250,11 @@ QHBoxLayout *checkbox_layout = new QHBoxLayout; - // FIXME: Synchronize the initial state of this checkbox with the default - // value of "news/allow_web_connection" stored elsewhere. - m_checkbox->setCheckState (Qt::Unchecked); + bool allow_connection = nr_allow_connection.def.toBool (); + if (allow_connection) + m_checkbox->setCheckState (Qt::Checked); + else + m_checkbox->setCheckState (Qt::Unchecked); m_checkbox_message->setText (tr ("<html><head>\n"