From 8ca96d752f3dd1dfbb8c5679837277c3120a441f Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 3 Aug 2011 13:09:57 +1000 Subject: [PATCH] More Preferences Dialog Stub work --- preferencesdialog.cpp | 60 ++++++++++ preferencesdialog.h | 10 +- preferencesdialog.ui | 248 +++++++++++++++++++++++++++--------------- 3 files changed, 227 insertions(+), 91 deletions(-) diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 1c20a76b..4dd17dcd 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -1,14 +1,74 @@ +#include +#include #include "preferencesdialog.h" #include "ui_preferencesdialog.h" +#include "SleepLib/machine_common.h" PreferencesDialog::PreferencesDialog(QWidget *parent) : QDialog(parent), ui(new Ui::PreferencesDialog) { ui->setupUi(this); + ui->eventTable->setColumnWidth(0,40); + ui->eventTable->setColumnWidth(1,50); + int row=0; + QTableWidgetItem *item; + QHash::iterator ci; + for (ci=channel.begin();ci!=channel.end();ci++) { + if ((ci.value().channeltype()==CT_Event) || (ci.value().channeltype()==CT_Graph)) { + ui->eventTable->insertRow(row); + item=new QTableWidgetItem(ci.value().details()); + ui->eventTable->setItem(row,2,item); + QCheckBox *c=new QCheckBox(ui->eventTable); + QLabel *pb=new QLabel(ui->eventTable); + pb->setText("foo"); + ui->eventTable->setCellWidget(row,0,c); + ui->eventTable->setCellWidget(row,1,pb); + QColor a(random() % 255, random() %255, random()%255, 255); + QPalette p(a,a,a,a,a,a,a); + + pb->setPalette(p); + pb->setAutoFillBackground(true); + pb->setBackgroundRole(QPalette::Background); + row++; + } + } +} +void PreferencesDialog::on_eventColor_selected(QString col) +{ } PreferencesDialog::~PreferencesDialog() { delete ui; } + +void PreferencesDialog::on_combineSlider_sliderMoved(int position) +{ + ui->combineLCD->display(position); +} + +void PreferencesDialog::on_IgnoreSlider_sliderMoved(int position) +{ + if (position>0) { + ui->IgnoreLCD->display(position); + } else ui->IgnoreLCD->display(tr("OFF")); +} + +void PreferencesDialog::on_eventTable_doubleClicked(const QModelIndex &index) +{ + int row=index.row(); + int col=index.column(); + if (col==1) { + QWidget *w=ui->eventTable->cellWidget(row,col); + QColorDialog a; + QColor color=w->palette().background().color(); + a.setCurrentColor(color); + if (a.exec()==QColorDialog::Accepted) { + QColor c=a.currentColor(); + QPalette p(c,c,c,c,c,c,c); + w->setPalette(p); + qDebug() << "Color accepted" << col; + } + } +} diff --git a/preferencesdialog.h b/preferencesdialog.h index 87ace507..fdffe5f1 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -2,7 +2,7 @@ #define PREFERENCESDIALOG_H #include - +#include namespace Ui { class PreferencesDialog; } @@ -15,6 +15,14 @@ public: explicit PreferencesDialog(QWidget *parent = 0); ~PreferencesDialog(); +private slots: + void on_combineSlider_sliderMoved(int position); + + void on_IgnoreSlider_sliderMoved(int position); + + void on_eventColor_selected(QString); + void on_eventTable_doubleClicked(const QModelIndex &index); + private: Ui::PreferencesDialog *ui; }; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 383174b0..08780b87 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,13 +29,13 @@ - 0 + 1 &Sessions - + @@ -51,9 +51,7 @@ - Sessions before this time will go to the previous calendar day. -You must restart SleepyHead to see these changes, -unless you haven't imported any data yet. + Sessions starting before this time will go to the previous calendar day. QAbstractSpinBox::UpDownArrows @@ -97,7 +95,7 @@ It will be faster changing to days you've already been to if you leave it on. - + @@ -109,62 +107,74 @@ It will be faster changing to days you've already been to if you leave it on. - - - - - - 0 - 0 - - - - Sessions shorter than this value will be kept together on the same day. -You must restart SleepyHead to see these changes, -unless you haven't imported any data yet. - - - 0 - - - 240 - - - 15 - - - 60 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksAbove - - - 15 - - - - - - - QFrame::Box - - - - + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - + + + + + + 0 + 0 + + + + Multiple sessions closer together than this value will be kept on the same day. + + + + 0 + + + 240 + + + 10 + + + 60 + + + 0 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 30 + + + + + + + QFrame::Box + + + + + + + @@ -176,38 +186,52 @@ unless you haven't imported any data yet. - - - - - Sessions shorter than this will not be imported. -Changing this value only affects future imports. - - - 60 - - - 5 - - - Qt::Horizontal - - - QSlider::TicksAbove - - - 5 - - - - - - - QFrame::Box - - - - + + + Minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sessions shorter in duration than this will not be displayed<span style=" font-style:italic;">.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;"></p></body></html> + + + 60 + + + 5 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + 5 + + + + + + + QFrame::Box + + @@ -226,6 +250,50 @@ Changing this value only affects future imports. + + + &Events + + + + + + true + + + 0 + + + 3 + + + true + + + + Show + + + AlignHCenter|AlignVCenter|AlignCenter + + + + + Colour + + + AlignHCenter|AlignVCenter|AlignCenter + + + + + Event + + + + + +