summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/alarmdlgbase.ui490
-rw-r--r--noncore/tools/clock/clock.cpp19
-rw-r--r--noncore/tools/clock/clock.h1
3 files changed, 494 insertions, 16 deletions
diff --git a/noncore/tools/clock/alarmdlgbase.ui b/noncore/tools/clock/alarmdlgbase.ui
index 63759f3..944f532 100644
--- a/noncore/tools/clock/alarmdlgbase.ui
+++ b/noncore/tools/clock/alarmdlgbase.ui
@@ -1,154 +1,636 @@
<!DOCTYPE UI><UI>
<class>AlarmDlgBase</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>AlarmDlgBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>124</width>
- <height>92</height>
+ <width>199</width>
+ <height>243</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Form1</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
- <number>6</number>
+ <number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout1</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>pixmap</cstring>
</property>
<property stdset="1">
<name>scaledContents</name>
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer1</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>alarmDlgLabel</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>TextLabel1</string>
</property>
+ <property stdset="1">
+ <name>scaledContents</name>
+ <bool>false</bool>
+ </property>
</widget>
</hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout2</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Snooze</string>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>snoozeTime</cstring>
</property>
<property stdset="1">
+ <name>caption</name>
+ <string></string>
+ </property>
+ <property stdset="1">
<name>suffix</name>
<string> mins</string>
</property>
<property stdset="1">
<name>maxValue</name>
<number>60</number>
</property>
<property stdset="1">
<name>lineStep</name>
<number>5</number>
</property>
+ <property stdset="1">
+ <name>value</name>
+ <number>5</number>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
</widget>
</hbox>
</widget>
<widget>
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
+ <cstring>cmdSnooze</cstring>
+ </property>
+ <property stdset="1">
+ <name>minimumSize</name>
+ <size>
+ <width>0</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property stdset="1">
+ <name>palette</name>
+ <palette>
+ <active>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>191</green>
+ <blue>191</blue>
+ </color>
+ <color>
+ <red>127</red>
+ <green>64</green>
+ <blue>64</blue>
+ </color>
+ <color>
+ <red>170</red>
+ <green>85</green>
+ <blue>85</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </active>
+ <disabled>
+ <color>
+ <red>128</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>166</green>
+ <blue>166</blue>
+ </color>
+ <color>
+ <red>127</red>
+ <green>64</green>
+ <blue>64</blue>
+ </color>
+ <color>
+ <red>170</red>
+ <green>85</green>
+ <blue>85</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>128</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </disabled>
+ <inactive>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>166</green>
+ <blue>166</blue>
+ </color>
+ <color>
+ <red>127</red>
+ <green>64</green>
+ <blue>64</blue>
+ </color>
+ <color>
+ <red>170</red>
+ <green>85</green>
+ <blue>85</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </inactive>
+ </palette>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Snooze</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
<cstring>cmdOk</cstring>
</property>
<property stdset="1">
+ <name>minimumSize</name>
+ <size>
+ <width>0</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property stdset="1">
+ <name>palette</name>
+ <palette>
+ <active>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>192</red>
+ <green>255</green>
+ <blue>192</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>223</red>
+ <green>255</green>
+ <blue>223</blue>
+ </color>
+ <color>
+ <red>96</red>
+ <green>127</green>
+ <blue>96</blue>
+ </color>
+ <color>
+ <red>128</red>
+ <green>170</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </active>
+ <disabled>
+ <color>
+ <red>128</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>192</red>
+ <green>255</green>
+ <blue>192</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>230</red>
+ <green>255</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>96</red>
+ <green>127</green>
+ <blue>96</blue>
+ </color>
+ <color>
+ <red>128</red>
+ <green>170</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>128</red>
+ <green>128</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </disabled>
+ <inactive>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>192</red>
+ <green>255</green>
+ <blue>192</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>230</red>
+ <green>255</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>96</red>
+ <green>127</green>
+ <blue>96</blue>
+ </color>
+ <color>
+ <red>128</red>
+ <green>170</green>
+ <blue>128</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>230</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <color>
+ <red>255</red>
+ <green>221</green>
+ <blue>118</blue>
+ </color>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </inactive>
+ </palette>
+ </property>
+ <property stdset="1">
<name>text</name>
<string>Close</string>
</property>
</widget>
</vbox>
</widget>
</UI>
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 9b324e0..325a307 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -81,98 +81,95 @@ static void toggleScreenSaver( bool on )
static void startPlayer()
{
Config config( "qpe" );
config.setGroup( "Time" );
sleep(15);
QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
e << config.readEntry( "mp3File", "" );
}
class MySpinBox : public QSpinBox
{
public:
QLineEdit *lineEdit() const {
return editor();
}
};
//
//
//
AlarmDlg::AlarmDlg(QWidget *parent, const char *name, bool modal,
const QString &txt) :
AlarmDlgBase(parent, name, modal)
{
+ // Increase font size to make it a little more readable
+ QFont f(font());
+ f.setPointSize((int)(f.pointSize() * 1.7));
+ setFont(f);
+
setCaption( tr("Clock") );
pixmap->setPixmap( Opie::Core::OResource::loadPixmap("clock/alarmbell") );
alarmDlgLabel->setText(txt);
- connect(snoozeTime, SIGNAL(valueChanged(int)), this,
- SLOT(changePrompt(int)));
- connect(cmdOk, SIGNAL(clicked()), this, SLOT(checkSnooze()));
+ connect(cmdSnooze, SIGNAL(clicked()), this, SLOT(checkSnooze()));
+ connect(cmdOk, SIGNAL(clicked()), this, SLOT(accept()));
}
+
//
//
//
void
AlarmDlg::setText(const QString &txt)
{
alarmDlgLabel->setText(txt);
}
//
//
//
void
AlarmDlg::checkSnooze(void)
{
//
// Ensure we have only one snooze alarm.
//
AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL,
ALARM_CLOCK_MESSAGE, magic_snooze);
if (snoozeTime->value() > 0) {
QDateTime wake = QDateTime::currentDateTime();
wake = wake.addSecs(snoozeTime->value() * 60); // snoozeTime in minutes
AlarmServer::addAlarm(wake, ALARM_CLOCK_CHANNEL,
ALARM_CLOCK_MESSAGE, magic_snooze);
}
accept();
}
-void
-AlarmDlg::changePrompt(int mins)
-{
- cmdOk->setText(mins > 0 ? tr("Snooze") : tr("Close") );
-}
-
-
-
Clock::Clock( QWidget * parent, const char *, WFlags f )
: ClockBase( parent, "clock", f ), swatch_splitms(99), init(FALSE) // No tr
{
alarmDlg = 0;
swLayout = 0;
dayBtn = new QToolButton * [7];
Config config( "qpe" );
config.setGroup("Time");
ampm = config.readBoolEntry( "AMPM", TRUE );
onMonday = config.readBoolEntry( "MONDAY" );
connect( tabs, SIGNAL(currentChanged(QWidget*)),
this, SLOT(tabChanged(QWidget*)) );
analogStopwatch = new AnalogClock( swFrame );
stopwatchLcd = new QLCDNumber( swFrame );
stopwatchLcd->setFrameStyle( QFrame::NoFrame );
stopwatchLcd->setSegmentStyle( QLCDNumber::Flat );
stopwatchLcd->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred) );
analogClock->display( QTime::currentTime() );
clockLcd->setNumDigits( 5 );
clockLcd->setFixedWidth( clockLcd->sizeHint().width() );
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index c063a9b..10bbfef 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -23,49 +23,48 @@
#include "clockbase.h"
#include "alarmdlgbase.h"
#include <qdatetime.h>
class QTimer;
class QLabel;
class QDialog;
class AnalogClock;
class QBoxLayout;
class QToolButton;
class AlarmDlg: public AlarmDlgBase
{
Q_OBJECT
public:
AlarmDlg(QWidget *parent = 0, const char *name = 0, bool modal = TRUE,
const QString &txt = "Alarm");
void setText(const QString &txt);
private slots:
void checkSnooze(void);
- void changePrompt(int minutes);
};
class Clock : public ClockBase
{
Q_OBJECT
public:
Clock( QWidget *parent=0, const char *name=0, WFlags fl=0 );
~Clock();
QDateTime when;
bool bSound;
int hour, minute, snoozeTime;
static QString appName() { return QString::fromLatin1("clock"); }
private slots:
void stopStartStopWatch();
void resetStopWatch();
void prevLap();
void nextLap();
void lapTimeout();
void tabChanged(QWidget*);
void updateClock();
void changeClock( bool );
void setDailyAmPm( int );