summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.pro2
-rw-r--r--noncore/tools/clock/config.in2
-rw-r--r--noncore/tools/clock/main.cpp3
-rw-r--r--noncore/tools/clock/opie-clock.control2
-rw-r--r--noncore/tools/clock/setAlarm.cpp28
5 files changed, 18 insertions, 19 deletions
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
@@ -1,10 +1,10 @@
CONFIG = qt warn_on release quick-app
HEADERS = clock.h setAlarm.h
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
@@ -15,13 +15,12 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "clock.h"
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
OPIE_EXPORT_APP( OApplicationFactory<Clock> )
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
@@ -1,10 +1,10 @@
Package: opie-clock
Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
Priority: optional
Section: opie/applications
Maintainer: Opie Team <opie@handhelds.org>
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
@@ -1,26 +1,26 @@
/***************************************************************************
// setAlarm.cpp - description
// -------------------
// 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 *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "setAlarm.h"
-#include <opie/ofileselector.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
#include <qpe/config.h>
#include <qpe/qpeapplication.h>
#include <qstring.h>
#include <qlabel.h>
#include <qlcdnumber.h>
#include <qpushbutton.h>
#include <qradiobutton.h>
@@ -32,23 +32,23 @@
#include <qbuttongroup.h>
#include <qcheckbox.h>
Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, 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 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Hour" ) );
Set_AlarmLayout->addWidget( TextLabel1, 0, 0 );
@@ -71,38 +71,38 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
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 );
useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this );
useMp3Check-> setFocusPolicy ( QWidget::NoFocus );
Set_AlarmLayout->addMultiCellWidget( useMp3Check, 2, 3, 3, 4 );
@@ -132,38 +132,38 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
bool ampm = config.readBoolEntry( "AMPM", TRUE );
QString alarmHour=config.readEntry("clockAlarmHour","8");
int i_alarmHour = alarmHour.toInt(&ok,10);
QString alarmMinute=config.readEntry("clockAlarmMinute","0");
QString snoozeTime=config.readEntry("clockAlarmSnooze","0");
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) );
} else {
Hour_Slider->setMaxValue( 23);
Hour_Slider->setMinValue( 0);
Hour_Slider->setValue( i_alarmHour);
Minute_Slider->setValue( alarmMinute.toInt(&ok,10) );
SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
Am_RadioButton->hide();
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)));
}
Set_Alarm::~Set_Alarm()
{
@@ -204,18 +204,18 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
Config config( "qpe" );
config.setGroup("Time");
if(b) {
QMap<QString, QStringList> map;
map.insert(tr("All"), QStringList() );
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);
config.writeEntry("mp3File",str);
}
} else {
config.writeEntry("mp3Alarm",0);
config.writeEntry("mp3File","");