1515#include < QSignalBlocker>
1616#include < QTimer>
1717#include < QFontDatabase>
18+ #include < QColor>
1819#include < QSet>
1920#include < algorithm>
2021
2122extern const char *programName;
2223
24+ namespace {
25+ ViewOptions defaultInterfaceOptions (const QString &name) {
26+ int theme = name.startsWith (" wlan" ) ? 3 : 0 ;
27+ #ifdef Q_OS_WIN
28+ if (QNetworkInterface::interfaceFromName (name).type () == QNetworkInterface::Wifi)
29+ theme = 3 ;
30+ #endif
31+ QFont font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
32+ font.setBold (true );
33+ ViewOptions defaults;
34+ defaults.mUpdateInterval = 500 ;
35+ defaults.mMonitoring = true ;
36+ defaults.mNotifications = true ;
37+ defaults.mDisplayTrayIcon = true ;
38+ defaults.mDisplayTextStatistics = false ;
39+ defaults.mTextDigit = 0 ;
40+ defaults.mTextDigitPosition = 0 ;
41+ defaults.mTextShowDigit = true ;
42+ defaults.mTextShadow = false ;
43+ defaults.mTextDigitColor = " #ffd700" ;
44+ defaults.mTextUploadColor = " #FF0000" ;
45+ defaults.mTextDownloadColor = " #00FF00" ;
46+ defaults.mTextBackgroundColor = " #202020" ;
47+ defaults.mTextTransparentBackground = false ;
48+ defaults.mTextFont = font;
49+ defaults.mTheme = theme;
50+ defaults.mChartUplColor = " #FF0000" ;
51+ defaults.mChartDldColor = " #00FF00" ;
52+ defaults.mChartBgColor = " #000000" ;
53+ defaults.mChartTransparentBackground = false ;
54+ return defaults;
55+ }
56+
57+ template <typename T>
58+ void saveOverride (QSettings &settings, const char *key, const T &value, const T &defaultValue) {
59+ if (value == defaultValue)
60+ settings.remove (key);
61+ else
62+ settings.setValue (key, QVariant::fromValue (value));
63+ }
64+
65+ void saveColorOverride (QSettings &settings, const char *key,
66+ const QString &value, const QString &defaultValue) {
67+ if (QColor (value) == QColor (defaultValue))
68+ settings.remove (key);
69+ else
70+ settings.setValue (key, value);
71+ }
72+ }
73+
2374QNetStats::QNetStats () : QDialog(nullptr , Qt::Window), mConfigure(nullptr ) {
2475 // read the current views from config file
2576 QSettings settings;
@@ -38,9 +89,9 @@ QNetStats::QNetStats() : QDialog(nullptr, Qt::Window), mConfigure(nullptr) {
3889 for (digit = 0 ; digit < 10 && digits.contains (digit); ++digit) {}
3990 settings.beginGroup (name);
4091 if (digit < 10 )
41- settings. setValue ( " TextStatisticsDigit" , digit);
92+ saveOverride (settings, " TextStatisticsDigit" , digit, defaultInterfaceOptions (name). mTextDigit );
4293 else
43- settings. setValue ( " DisplayTextStatistics" , false );
94+ saveOverride (settings, " DisplayTextStatistics" , false , defaultInterfaceOptions (name). mDisplayTextStatistics );
4495 settings.endGroup ();
4596 }
4697 if (digit < 10 )
@@ -224,39 +275,30 @@ QString QNetStats::interfaceDisplayName(const QString &name) {
224275
225276void QNetStats::readInterfaceConfig (const QString &ifName, ViewOptions *opts) {
226277 QSettings settings;
227- int defaultTheme = ifName.startsWith (" wlan" ) ? 3 : 0 ;
228- #ifdef Q_OS_WIN
229- if (QNetworkInterface::interfaceFromName (ifName).type () == QNetworkInterface::Wifi)
230- defaultTheme = 3 ;
231- #endif
232-
278+ const ViewOptions defaults = defaultInterfaceOptions (ifName);
233279 settings.beginGroup (ifName);
234- // General Settings
235- opts->mUpdateInterval = settings.value (" UpdateInterval" , 500 ).toInt ();
280+ opts->mUpdateInterval = settings.value (" UpdateInterval" , defaults.mUpdateInterval ).toInt ();
236281 if (opts->mUpdateInterval <= 0 )
237- opts->mUpdateInterval = 500 ;
238- opts->mMonitoring = settings.value (" Monitoring" , true ).toBool ();
239- opts->mNotifications = settings.value (" DisplayNotifications" , true ).toBool ();
240- opts->mDisplayTrayIcon = settings.value (" DisplayTrayIcon" , true ).toBool ();
241- opts->mDisplayTextStatistics = settings.value (" DisplayTextStatistics" , false ).toBool ();
242- opts->mTextDigit = std::clamp (settings.value (" TextStatisticsDigit" , 0 ).toInt (), 0 , 9 );
243- opts->mTextDigitPosition = std::clamp (settings.value (" TextStatisticsDigitPosition" , 0 ).toInt (), 0 , 3 );
244- opts->mTextShowDigit = settings.value (" TextStatisticsShowDigit" , true ).toBool ();
245- opts->mTextShadow = settings.value (" TextStatisticsShadow" , false ).toBool ();
246- opts->mTextDigitColor = settings.value (" TextStatisticsDigitColor" , " #ffd700" ).toString ();
247- opts->mTextUploadColor = settings.value (" TextStatisticsUploadColor" , " #FF0000" ).toString ();
248- opts->mTextDownloadColor = settings.value (" TextStatisticsDownloadColor" , " #00FF00" ).toString ();
249- opts->mTextBackgroundColor = settings.value (" TextStatisticsBackgroundColor" , " #202020" ).toString ();
250- opts->mTextTransparentBackground = settings.value (" TextStatisticsTransparentBackground" , false ).toBool ();
251- QFont font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
252- font.setBold (true );
253- opts->mTextFont = settings.value (" TextStatisticsFont" , QVariant::fromValue (font)).value <QFont>();
254- opts->mTheme = settings.value (" Theme" , defaultTheme).toInt ();
255- // Graph Settings
256- opts->mChartUplColor = settings.value (" ChartUplColor" , " #FF0000" ).toString ();
257- opts->mChartDldColor = settings.value (" ChartDldColor" , " #00FF00" ).toString ();
258- opts->mChartBgColor = settings.value (" ChartBgColor" , " #000000" ).toString ();
259- opts->mChartTransparentBackground = settings.value (" ChartUseTransparentBackground" , false ).toBool ();
282+ opts->mUpdateInterval = defaults.mUpdateInterval ;
283+ opts->mMonitoring = settings.value (" Monitoring" , defaults.mMonitoring ).toBool ();
284+ opts->mNotifications = settings.value (" DisplayNotifications" , defaults.mNotifications ).toBool ();
285+ opts->mDisplayTrayIcon = settings.value (" DisplayTrayIcon" , defaults.mDisplayTrayIcon ).toBool ();
286+ opts->mDisplayTextStatistics = settings.value (" DisplayTextStatistics" , defaults.mDisplayTextStatistics ).toBool ();
287+ opts->mTextDigit = std::clamp (settings.value (" TextStatisticsDigit" , defaults.mTextDigit ).toInt (), 0 , 9 );
288+ opts->mTextDigitPosition = std::clamp (settings.value (" TextStatisticsDigitPosition" , defaults.mTextDigitPosition ).toInt (), 0 , 3 );
289+ opts->mTextShowDigit = settings.value (" TextStatisticsShowDigit" , defaults.mTextShowDigit ).toBool ();
290+ opts->mTextShadow = settings.value (" TextStatisticsShadow" , defaults.mTextShadow ).toBool ();
291+ opts->mTextDigitColor = settings.value (" TextStatisticsDigitColor" , defaults.mTextDigitColor ).toString ();
292+ opts->mTextUploadColor = settings.value (" TextStatisticsUploadColor" , defaults.mTextUploadColor ).toString ();
293+ opts->mTextDownloadColor = settings.value (" TextStatisticsDownloadColor" , defaults.mTextDownloadColor ).toString ();
294+ opts->mTextBackgroundColor = settings.value (" TextStatisticsBackgroundColor" , defaults.mTextBackgroundColor ).toString ();
295+ opts->mTextTransparentBackground = settings.value (" TextStatisticsTransparentBackground" , defaults.mTextTransparentBackground ).toBool ();
296+ opts->mTextFont = settings.value (" TextStatisticsFont" , QVariant::fromValue (defaults.mTextFont )).value <QFont>();
297+ opts->mTheme = settings.value (" Theme" , defaults.mTheme ).toInt ();
298+ opts->mChartUplColor = settings.value (" ChartUplColor" , defaults.mChartUplColor ).toString ();
299+ opts->mChartDldColor = settings.value (" ChartDldColor" , defaults.mChartDldColor ).toString ();
300+ opts->mChartBgColor = settings.value (" ChartBgColor" , defaults.mChartBgColor ).toString ();
301+ opts->mChartTransparentBackground = settings.value (" ChartUseTransparentBackground" , defaults.mChartTransparentBackground ).toBool ();
260302 settings.endGroup ();
261303}
262304
@@ -272,31 +314,30 @@ void QNetStats::saveConfig(const OptionsMap &options) {
272314 TrayIconMap::Iterator trayIcon = mViews .find (i.key ());
273315 const ViewOptions &opt = i.value ();
274316
317+ const ViewOptions defaults = defaultInterfaceOptions (i.key ());
275318 settings.beginGroup (i.key ());
276- // General Options
277- settings.setValue (" UpdateInterval" , opt.mUpdateInterval );
278- settings.setValue (" Monitoring" , opt.mMonitoring );
279- settings.setValue (" DisplayNotifications" , opt.mNotifications );
280- settings.setValue (" DisplayTrayIcon" , opt.mDisplayTrayIcon );
281- settings.setValue (" DisplayTextStatistics" , opt.mDisplayTextStatistics );
282- settings.setValue (" TextStatisticsDigit" , opt.mTextDigit );
283- settings.setValue (" TextStatisticsDigitPosition" , opt.mTextDigitPosition );
284- settings.setValue (" TextStatisticsShowDigit" , opt.mTextShowDigit );
319+ saveOverride (settings, " UpdateInterval" , opt.mUpdateInterval , defaults.mUpdateInterval );
320+ saveOverride (settings, " Monitoring" , opt.mMonitoring , defaults.mMonitoring );
321+ saveOverride (settings, " DisplayNotifications" , opt.mNotifications , defaults.mNotifications );
322+ saveOverride (settings, " DisplayTrayIcon" , opt.mDisplayTrayIcon , defaults.mDisplayTrayIcon );
323+ saveOverride (settings, " DisplayTextStatistics" , opt.mDisplayTextStatistics , defaults.mDisplayTextStatistics );
324+ saveOverride (settings, " TextStatisticsDigit" , opt.mTextDigit , defaults.mTextDigit );
325+ saveOverride (settings, " TextStatisticsDigitPosition" , opt.mTextDigitPosition , defaults.mTextDigitPosition );
326+ saveOverride (settings, " TextStatisticsShowDigit" , opt.mTextShowDigit , defaults.mTextShowDigit );
327+ saveOverride (settings, " TextStatisticsShadow" , opt.mTextShadow , defaults.mTextShadow );
328+ saveColorOverride (settings, " TextStatisticsDigitColor" , opt.mTextDigitColor , defaults.mTextDigitColor );
329+ saveColorOverride (settings, " TextStatisticsUploadColor" , opt.mTextUploadColor , defaults.mTextUploadColor );
330+ saveColorOverride (settings, " TextStatisticsDownloadColor" , opt.mTextDownloadColor , defaults.mTextDownloadColor );
331+ saveColorOverride (settings, " TextStatisticsBackgroundColor" , opt.mTextBackgroundColor , defaults.mTextBackgroundColor );
332+ saveOverride (settings, " TextStatisticsTransparentBackground" , opt.mTextTransparentBackground , defaults.mTextTransparentBackground );
333+ saveOverride (settings, " TextStatisticsFont" , opt.mTextFont , defaults.mTextFont );
334+ saveOverride (settings, " Theme" , opt.mTheme , defaults.mTheme );
335+ saveColorOverride (settings, " ChartUplColor" , opt.mChartUplColor , defaults.mChartUplColor );
336+ saveColorOverride (settings, " ChartDldColor" , opt.mChartDldColor , defaults.mChartDldColor );
337+ saveColorOverride (settings, " ChartBgColor" , opt.mChartBgColor , defaults.mChartBgColor );
338+ saveOverride (settings, " ChartUseTransparentBackground" , opt.mChartTransparentBackground , defaults.mChartTransparentBackground );
285339 settings.remove (" TextStatisticsDigitMode" );
286- settings.setValue (" TextStatisticsShadow" , opt.mTextShadow );
287- settings.setValue (" TextStatisticsDigitColor" , opt.mTextDigitColor );
288340 settings.remove (" TextStatisticsColor" );
289- settings.setValue (" TextStatisticsUploadColor" , opt.mTextUploadColor );
290- settings.setValue (" TextStatisticsDownloadColor" , opt.mTextDownloadColor );
291- settings.setValue (" TextStatisticsBackgroundColor" , opt.mTextBackgroundColor );
292- settings.setValue (" TextStatisticsTransparentBackground" , opt.mTextTransparentBackground );
293- settings.setValue (" TextStatisticsFont" , QVariant::fromValue (opt.mTextFont ));
294- settings.setValue (" Theme" , opt.mTheme );
295- // Chart Options
296- settings.setValue (" ChartUplColor" , opt.mChartUplColor );
297- settings.setValue (" ChartDldColor" , opt.mChartDldColor );
298- settings.setValue (" ChartBgColor" , opt.mChartBgColor );
299- settings.setValue (" ChartUseTransparentBackground" , opt.mChartTransparentBackground );
300341 settings.endGroup ();
301342
302343 if (opt.mMonitoring ) { // check if we are already monitoring this interface.
0 commit comments