summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-12 18:02:30 (UTC)
committer llornkcor <llornkcor>2002-04-12 18:02:30 (UTC)
commitb7e13820e0adc60fa4927edeb60d8f2c3c221887 (patch) (side-by-side diff)
tree67c3efe9aa1633dcdf1faf459bab9e3a5f39db61
parentdac84ca1099fe40bf6e05140bad04eeaa155669d (diff)
downloadopie-b7e13820e0adc60fa4927edeb60d8f2c3c221887.zip
opie-b7e13820e0adc60fa4927edeb60d8f2c3c221887.tar.gz
opie-b7e13820e0adc60fa4927edeb60d8f2c3c221887.tar.bz2
changed buttons to more obvious intention, and made setting alarm slider pagestep to onemake
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp8
-rw-r--r--noncore/tools/clock/setAlarm.cpp1
2 files changed, 5 insertions, 4 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 6f570c5..097ea90 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -138,53 +138,53 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
connect( snoozeBtn, SIGNAL( clicked() ), SLOT( slotSnooze() ) );
connect( alarmOffBtn, SIGNAL( clicked() ), SLOT( slotToggleAlarm() ) );
connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
this, SLOT(appMessage(const QCString&, const QByteArray&)) );
t = new QTimer( this );
connect( t, SIGNAL( timeout() ), SLOT( updateClock() ) );
t->start( 1000 );
connect( qApp, SIGNAL( timeChanged() ), SLOT( updateClock() ) );
swatch_running = FALSE;
swatch_totalms = 0;
connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
QString tmp = config.readEntry("clockAlarmHour", "");
bool ok;
hour = tmp.toInt(&ok,10);
tmp = config.readEntry("clockAlarmMinute","");
minute = tmp.toInt(&ok,10);
if( config.readEntry("clockAlarmSet","FALSE") == "TRUE") {
- alarmOffBtn->setText( tr( "Alarm On" ) );
+ alarmOffBtn->setText( tr( "Alarm Is On" ) );
alarmBool=TRUE;
snoozeBtn->show();
} else {
- alarmOffBtn->setText( tr( "Alarm Off" ) );
+ alarmOffBtn->setText( tr( "Alarm Is Off" ) );
alarmBool=FALSE;
snoozeBtn->hide();
}
QTimer::singleShot( 0, this, SLOT(updateClock()) );
modeSelect(0);
}
Clock::~Clock()
{
toggleScreenSaver( true );
}
void Clock::updateClock()
{
if ( clockRB->isChecked() ) {
QTime tm = QDateTime::currentDateTime().time();
QString s;
if ( ampm ) {
int hour = tm.hour();
if (hour == 0)
hour = 12;
if (hour > 12)
hour -= 12;
@@ -305,55 +305,55 @@ void Clock::slotSetAlarm()
config.write();
}
}
void Clock::slotSnooze()
{
bSound=FALSE;
int warn;
QTime t = QTime::currentTime();
QDateTime whenl( when.date(), t.addSecs( snoozeTime*60));
when=whenl;
AlarmServer::addAlarm( when,
"QPE/Application/clock",
"alarm(QDateTime,int)", warn );
}
//toggles alarm on/off
void Clock::slotToggleAlarm()
{
Config config( "qpe" );
config.setGroup("Time");
if(alarmBool) {
config.writeEntry("clockAlarmSet","FALSE");
- alarmOffBtn->setText( tr( "Alarm Off" ) );
+ alarmOffBtn->setText( tr( "Alarm Is Off" ) );
snoozeBtn->hide();
alarmBool=FALSE;
alarmOff();
} else {
config.writeEntry("clockAlarmSet","TRUE");
- alarmOffBtn->setText( tr( "Alarm On" ) );
+ alarmOffBtn->setText( tr( "Alarm Is On" ) );
snoozeBtn->show();
alarmBool=TRUE;
alarmOn();
}
config.write();
}
void Clock::alarmOn()
{
QDate d = QDate::currentDate();
QTime tm((int)hour,(int)minute,0);
qDebug("Time set "+tm.toString());
QTime t = QTime::currentTime();
if( t > tm)
d = d.addDays(1);
int warn;
QDateTime whenl(d,tm);
when=whenl;
AlarmServer::addAlarm( when,
"QPE/Application/clock",
"alarm(QDateTime,int)", warn );
QMessageBox::message("Note","Alarm is set for:\n"+ whenl.toString());
}
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 01e52f6..6b95e6a 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -48,48 +48,49 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
Set_AlarmLayout->addWidget( TextLabel1, 0, 0 );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "Minute" ) );
Set_AlarmLayout->addMultiCellWidget( TextLabel2, 0, 0, 1, 2 );
Hour_Slider = new QSlider( this, "Hour_Slider" );
Hour_Slider->setPageStep( 1);
Hour_Slider->setOrientation( QSlider::Horizontal );
connect(Hour_Slider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeHour(int)));
Set_AlarmLayout->addWidget( Hour_Slider, 2, 0 );
Hour_LCDNumber = new QLCDNumber( this, "Hour_LCDNumber" );
Hour_LCDNumber->setFrameShape( QLCDNumber::Box );
Hour_LCDNumber->setFrameShadow( QLCDNumber::Plain );
Hour_LCDNumber->setSegmentStyle( QLCDNumber::Flat );
Set_AlarmLayout->addWidget( Hour_LCDNumber, 1, 0 );
Minute_Slider = new QSlider( this, "Minute_Slider" );
Minute_Slider->setMaxValue( 59);
+ Minute_Slider->setPageStep( 1);
Minute_Slider->setOrientation( QSlider::Horizontal );
connect(Minute_Slider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeMinute(int)));
Set_AlarmLayout->addMultiCellWidget( Minute_Slider, 2, 2, 1, 2 );
Minute_LCDNumber = new QLCDNumber( this, "Minute_LCDNumber" );
Minute_LCDNumber->setFrameShape( QLCDNumber::Box );
Minute_LCDNumber->setFrameShadow( QLCDNumber::Plain );
Minute_LCDNumber->setSegmentStyle( QLCDNumber::Flat );
Set_AlarmLayout->addMultiCellWidget( Minute_LCDNumber, 1, 1, 1, 2 );
Am_RadioButton = new QRadioButton( this, "Am_RadioButton" );
Am_RadioButton->setText( tr( "AM" ) );
Am_RadioButton->setChecked(TRUE);
connect( Am_RadioButton, SIGNAL(toggled(bool)),this,SLOT( amButtonToggled(bool)));
Set_AlarmLayout->addMultiCellWidget( Am_RadioButton, 0, 1, 3, 4 );
Pm_RadioButton = new QRadioButton( this, "Pm_RadioButton" );
Pm_RadioButton->setText( tr( "PM" ) );
connect( Pm_RadioButton, SIGNAL(toggled(bool)),this,SLOT( pmButtonToggled(bool)));