diff --git a/daily.ui b/daily.ui index 84dc14df..4989c3c5 100644 --- a/daily.ui +++ b/daily.ui @@ -57,7 +57,7 @@ 0 - 180 + 200 diff --git a/mainwindow.cpp b/mainwindow.cpp index 66145be5..df57eae7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -139,10 +139,10 @@ MainWindow::MainWindow(QWidget *parent) : extern MainWindow *mainwin; MainWindow::~MainWindow() { - if (!isMaximized()) { + //if (!isMaximized()) { QSettings settings("Jedimark", "SleepyHead"); settings.setValue("MainWindow/geometry", saveGeometry()); - } + //} //QWidget::closeEvent(event); if (daily) { daily->close(); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 1f5249d3..b9712f8d 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -196,18 +196,20 @@ void PreferencesDialog::Save() QApplication::setFont(font); *defaultfont=ui->graphFont->currentFont(); + defaultfont->setPointSize(ui->graphFontSize->value()); defaultfont->setWeight(ui->graphFontBold->isChecked()?QFont::Bold : QFont::Normal); defaultfont->setItalic(ui->graphFontItalic->isChecked()); *mediumfont=ui->titleFont->currentFont(); + mediumfont->setPointSize(ui->titleFontSize->value()); mediumfont->setWeight(ui->titleFontBold->isChecked()?QFont::Bold : QFont::Normal); mediumfont->setItalic(ui->titleFontItalic->isChecked()); *bigfont=ui->bigFont->currentFont(); + bigfont->setPointSize(ui->bigFontSize->value()); bigfont->setWeight(ui->bigFontBold->isChecked()?QFont::Bold : QFont::Normal); bigfont->setItalic(ui->bigFontItalic->isChecked()); - for (QHash::iterator i=m_new_colors.begin();i!=m_new_colors.end();i++) { schema::Channel &chan=schema::channel[i.key()]; if (!chan.isNull()) { diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 5052633e..d99c837f 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -518,7 +518,7 @@ p, li { white-space: pre-wrap; } Application Fonts - + @@ -531,10 +531,10 @@ p, li { white-space: pre-wrap; } - + - + 6 @@ -547,7 +547,7 @@ p, li { white-space: pre-wrap; } - + @@ -560,10 +560,10 @@ p, li { white-space: pre-wrap; } - + - + 6 @@ -576,7 +576,7 @@ p, li { white-space: pre-wrap; } - + @@ -589,10 +589,10 @@ p, li { white-space: pre-wrap; } - + - + 6 @@ -605,17 +605,17 @@ p, li { white-space: pre-wrap; } - + Big Text - + - + 6 @@ -628,63 +628,114 @@ p, li { white-space: pre-wrap; } - + - - Italic + + + 0 + 0 + - - - - - Bold + - - - Bold + + + + 0 + 0 + + + + Qt::LeftToRight - - - - - Italic + - + + + + 0 + 0 + + - Bold + - + + + + 0 + 0 + + - Italic + - + + + + 0 + 0 + + - Bold + - + + + + 0 + 0 + + - Italic + - + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + Qt::Vertical @@ -697,6 +748,61 @@ p, li { white-space: pre-wrap; } + + + + + 0 + 0 + + + + Size + + + + + + + + 0 + 0 + + + + Bold + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Italic + + + + + + + + 0 + 0 + + + + Font + + +