Mercurial > octave
comparison libgui/src/main-window.cc @ 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 | 0495b64288f7 |
children | 45bb5bbaf291 |
comparison
equal
deleted
inserted
replaced
27612:62236e51a8c6 | 27613:deb8877f2c34 |
---|---|
55 # include "file-editor.h" | 55 # include "file-editor.h" |
56 #endif | 56 #endif |
57 #include "gui-preferences-ed.h" | 57 #include "gui-preferences-ed.h" |
58 #include "gui-preferences-global.h" | 58 #include "gui-preferences-global.h" |
59 #include "gui-preferences-mw.h" | 59 #include "gui-preferences-mw.h" |
60 #include "gui-preferences-nr.h" | |
60 #include "gui-settings.h" | 61 #include "gui-settings.h" |
61 #include "interpreter-qobject.h" | 62 #include "interpreter-qobject.h" |
62 #include "main-window.h" | 63 #include "main-window.h" |
63 #include "news-reader.h" | 64 #include "news-reader.h" |
64 #include "octave-qobject.h" | 65 #include "octave-qobject.h" |
183 m_active_dock = nullptr; | 184 m_active_dock = nullptr; |
184 | 185 |
185 if (settings) | 186 if (settings) |
186 { | 187 { |
187 connect_to_web | 188 connect_to_web |
188 = settings->value ("news/allow_web_connection", false).toBool (); | 189 = settings->value (nr_allow_connection.key, |
190 nr_allow_connection.def).toBool (); | |
189 | 191 |
190 last_checked | 192 last_checked |
191 = settings->value ("news/last_time_checked", QDateTime ()).toDateTime (); | 193 = settings->value (nr_last_time.key, nr_last_time.def).toDateTime (); |
192 | 194 |
193 serial = settings->value ("news/last_news_item", 0).toInt (); | 195 serial = settings->value (nr_last_news.key, nr_last_news.def).toInt (); |
194 m_default_encoding = settings->value (ed_default_enc.key, | 196 m_default_encoding = settings->value (ed_default_enc.key, |
195 ed_default_enc.def).toString (); | 197 ed_default_enc.def).toString (); |
196 } | 198 } |
197 | 199 |
198 QDateTime current = QDateTime::currentDateTime (); | 200 QDateTime current = QDateTime::currentDateTime (); |
661 { | 663 { |
662 gui_settings *settings = resource_manager::get_settings (); | 664 gui_settings *settings = resource_manager::get_settings (); |
663 | 665 |
664 bool connect_to_web | 666 bool connect_to_web |
665 = (settings | 667 = (settings |
666 ? settings->value ("news/allow_web_connection", false).toBool () | 668 ? settings->value (nr_allow_connection.key, |
669 nr_allow_connection.def).toBool () | |
667 : true); | 670 : true); |
668 | 671 |
669 QString base_url = "https://octave.org"; | 672 QString base_url = "https://octave.org"; |
670 QString page = "community-news.html"; | 673 QString page = "community-news.html"; |
671 | 674 |