changed buttons to more obvious intention, and made setting alarm slider pagestep to onemake

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
@@ -130,69 +130,69 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
     alarmBtn->setMaximumSize(60,30);
     gl->addWidget( alarmBtn, 1, 2 );
     alarmBtn->setText( tr( "Set Alarm" ) );
 
     connect( set, SIGNAL( pressed() ), SLOT( slotSet() ) );
     connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) );
 
     connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) );
     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;
       s.sprintf( "%2d%c%02d", hour, ':', tm.minute() );
       ampmLabel->setText( (tm.hour() >= 12) ? "PM" : "AM" );
       ampmLabel->show();
   } else {
       s.sprintf( "%2d%c%02d", tm.hour(), ':', tm.minute() );
       ampmLabel->hide();
   }
   lcd->display( s );
@@ -297,71 +297,71 @@ void Clock::slotSetAlarm()
         snoozeTime=setAlarmDlg->SnoozeSlider->value();
         if(ampm) {
             if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 )
                 hour+=12;
         }
         config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10);
         config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10);
         config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10);
         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());
 }
 
 void Clock::alarmOff()
 {
     int warn;
     bSound=FALSE;
         AlarmServer::deleteAlarm( when,
                                "QPE/Application/clock",
                                "alarm(QDateTime,int)", warn );
       qDebug("Alarm Off "+ when.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
@@ -40,64 +40,65 @@ Set_Alarm::Set_Alarm( QWidget* parent,  const char* name, bool modal, WFlags fl
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     Set_AlarmLayout = new QGridLayout( this ); 
     Set_AlarmLayout->setSpacing( 6 );
     Set_AlarmLayout->setMargin( 11 );
 
     TextLabel1 = new QLabel( this, "TextLabel1" );
     TextLabel1->setText( tr( "Hour" ) );
 
     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)));
     
     Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 );
 
     TextLabel3 = new QLabel( this, "TextLabel3" );
     TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) );
 
     Set_AlarmLayout->addMultiCellWidget( TextLabel3, 3, 3, 0, 1 );
 
     Snooze_LCDNumber = new QLCDNumber( this, "Snooze_LCDNumber" );