From 7cd53bb0080e8156914a3fd5f0666b47a8619df1 Mon Sep 17 00:00:00 2001 From: drw Date: Tue, 02 Mar 2004 23:27:16 +0000 Subject: Clock: libopie -> libopie2 --- (limited to 'noncore/tools') diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index d5a9949..fbe0a06 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -4,7 +4,7 @@ SOURCES = clock.cpp setAlarm.cpp \ main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie -lpthread +LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread TARGET = clock include ( $(OPIEDIR)/include.pro ) diff --git a/noncore/tools/clock/config.in b/noncore/tools/clock/config.in index abcc8f4..ce2472f 100644 --- a/noncore/tools/clock/config.in +++ b/noncore/tools/clock/config.in @@ -1,4 +1,4 @@ config CLOCK boolean "opie-clock (clock and stop-watch)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp index 4a5e523..89dd1bd 100644 --- a/noncore/tools/clock/main.cpp +++ b/noncore/tools/clock/main.cpp @@ -20,8 +20,7 @@ #include "clock.h" -#include -#include +#include OPIE_EXPORT_APP( OApplicationFactory ) diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control index 37991a1..3d3af67 100644 --- a/noncore/tools/clock/opie-clock.control +++ b/noncore/tools/clock/opie-clock.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/applications Maintainer: Opie Team Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Clock and stop-watch A simple clock and stop-watch for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp index 7c9ded2..6fec5a0 100644 --- a/noncore/tools/clock/setAlarm.cpp +++ b/noncore/tools/clock/setAlarm.cpp @@ -4,7 +4,7 @@ // Created: Wed Mar 13 19:47:24 2002 // copyright : (C) 2002 by ljp // email : ljp@llornkcor.com -// +// *************************************************************************** * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -14,8 +14,8 @@ #include "setAlarm.h" -#include -#include +#include +#include #include #include @@ -37,13 +37,13 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl { if ( !name ) setName( "Set_Alarm" ); - resize( 240, 101 ); + resize( 240, 101 ); setMaximumSize( QSize( 240, 320 ) ); move(0,45); setCaption( tr( "Set Alarm" ) ); connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); - Set_AlarmLayout = new QGridLayout( this ); + Set_AlarmLayout = new QGridLayout( this ); Set_AlarmLayout->setSpacing( 6 ); Set_AlarmLayout->setMargin( 11 ); @@ -76,7 +76,7 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl 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" ); @@ -90,14 +90,14 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl 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 ); useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this ); @@ -137,14 +137,14 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl if(ampm) { Hour_Slider->setMaxValue( 12); Hour_Slider->setMinValue( 1); - + if( i_alarmHour > 12) { i_alarmHour = i_alarmHour - 12; Pm_RadioButton->setChecked(TRUE); } else if ( i_alarmHour == 0 ) { - i_alarmHour = 12; - } + i_alarmHour = 12; + } Hour_Slider->setValue( i_alarmHour ); Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); @@ -158,7 +158,7 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl Pm_RadioButton->hide(); } if( config.readBoolEntry("mp3Alarm") ) - useMp3Check->setChecked(true); + useMp3Check->setChecked(true); // signals and slots connections connect(useMp3Check,SIGNAL(toggled(bool)),this,SLOT(slotChangemp3CkeckBox(bool))); @@ -209,8 +209,8 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { QStringList text; text << "audio/*"; map.insert(tr("Audio"), text ); - QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); -// QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); + QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); +// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); if(!str.isEmpty() ) { qDebug(str); config.writeEntry("mp3Alarm",1); -- cgit v0.9.0.2