From dc3ef05d38c2a873b377c40f95c36edcfe330864 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 5 Oct 2011 22:38:32 +1000 Subject: [PATCH] Added Graph Snapshots nag message.. Not sure if this bug is really fixed --- Graphs/gGraphView.cpp | 6 +++--- docs/index.html | 4 ++++ preferencesdialog.cpp | 8 ++++++++ preferencesdialog.h | 2 ++ preferencesdialog.ui | 16 ++++++++-------- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index d81bad55..94d3f84b 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -47,9 +47,9 @@ void InitGraphs() //mediumfont=new QFont("Serif",11); //bigfont=new QFont("Serif",35); - defaultfont->setStyleHint(QFont::SansSerif,QFont::OpenGLCompatible); - mediumfont->setStyleHint(QFont::SansSerif,QFont::OpenGLCompatible); - bigfont->setStyleHint(QFont::Serif ,QFont::OpenGLCompatible); + defaultfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); + mediumfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); + bigfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); //mediumfont->setBold(true); _graph_init=true; } diff --git a/docs/index.html b/docs/index.html index 286c5ac0..9d157262 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,5 +1,9 @@ + diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index b9712f8d..445ff242 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "preferencesdialog.h" #include "ui_preferencesdialog.h" #include "SleepLib/machine_common.h" @@ -256,3 +257,10 @@ void PreferencesDialog::on_bigFontSize_valueChanged(int arg1) { ui->bigFont->currentFont().setPointSize(arg1); } + +void PreferencesDialog::on_useGraphSnapshots_toggled(bool checked) +{ + if (checked && QMessageBox::question(this,"Warning","The Graph Snapshots feature (used by the Pie Chart in Daily stats panel) has been known to not work on some older computers.\n\nIf you experience a crash because of it, you will have to remove your SleepApp folder and recreate your profile.\n\n(I'm fairly sure this Qt bug is fixed now, but this has not been tested enough. If you have previously seen the pie chart, it's perfectly ok.)\n\nAre you sure you want to enable it?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { + ui->useGraphSnapshots->setChecked(false); + } +} diff --git a/preferencesdialog.h b/preferencesdialog.h index 711a2f28..1a31293e 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -37,6 +37,8 @@ private slots: void on_bigFontSize_valueChanged(int arg1); + void on_useGraphSnapshots_toggled(bool checked); + private: Ui::PreferencesDialog *ui; Profile * profile; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index d99c837f..a2964caa 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,7 +29,7 @@ - 4 + 0 @@ -463,6 +463,13 @@ p, li { white-space: pre-wrap; } 0 + + + + This page is yet another work in progress. Please ignore. + + + @@ -486,13 +493,6 @@ p, li { white-space: pre-wrap; } - - - - This page is yet another work in progress. Please ignore. - - -