-rw-r--r-- | noncore/tools/clock/clock.pro | 2 | ||||
-rw-r--r-- | noncore/tools/clock/config.in | 2 | ||||
-rw-r--r-- | noncore/tools/clock/main.cpp | 3 | ||||
-rw-r--r-- | noncore/tools/clock/opie-clock.control | 2 | ||||
-rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 28 |
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 | |||
@@ -5,5 +5,5 @@ SOURCES = clock.cpp setAlarm.cpp \ | |||
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopie -lpthread | 7 | LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread |
8 | TARGET = clock | 8 | TARGET = clock |
9 | 9 | ||
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 | |||
@@ -2,3 +2,3 @@ | |||
2 | boolean "opie-clock (clock and stop-watch)" | 2 | boolean "opie-clock (clock and stop-watch)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
@@ -21,6 +21,5 @@ | |||
21 | #include "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | #include <opie/oapplicationfactory.h> | ||
25 | 24 | ||
26 | 25 | ||
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 | |||
@@ -5,5 +5,5 @@ Section: opie/applications | |||
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Clock and stop-watch | 8 | Description: Clock and stop-watch |
9 | A simple clock and stop-watch for the Opie environment. | 9 | A simple clock and stop-watch for the Opie environment. |
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 | |||
@@ -5,5 +5,5 @@ | |||
5 | // copyright : (C) 2002 by ljp | 5 | // copyright : (C) 2002 by ljp |
6 | // email : ljp@llornkcor.com | 6 | // email : ljp@llornkcor.com |
7 | // | 7 | // |
8 | *************************************************************************** | 8 | *************************************************************************** |
9 | * This program is free software; you can redistribute it and/or modify * | 9 | * This program is free software; you can redistribute it and/or modify * |
@@ -15,6 +15,6 @@ | |||
15 | #include "setAlarm.h" | 15 | #include "setAlarm.h" |
16 | 16 | ||
17 | #include <opie/ofileselector.h> | 17 | #include <opie2/ofileselector.h> |
18 | #include <opie/ofiledialog.h> | 18 | #include <opie2/ofiledialog.h> |
19 | 19 | ||
20 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
@@ -38,5 +38,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
38 | if ( !name ) | 38 | if ( !name ) |
39 | setName( "Set_Alarm" ); | 39 | setName( "Set_Alarm" ); |
40 | resize( 240, 101 ); | 40 | resize( 240, 101 ); |
41 | setMaximumSize( QSize( 240, 320 ) ); | 41 | setMaximumSize( QSize( 240, 320 ) ); |
42 | move(0,45); | 42 | move(0,45); |
@@ -44,5 +44,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
44 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 44 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
45 | 45 | ||
46 | Set_AlarmLayout = new QGridLayout( this ); | 46 | Set_AlarmLayout = new QGridLayout( this ); |
47 | Set_AlarmLayout->setSpacing( 6 ); | 47 | Set_AlarmLayout->setSpacing( 6 ); |
48 | Set_AlarmLayout->setMargin( 11 ); | 48 | Set_AlarmLayout->setMargin( 11 ); |
@@ -77,5 +77,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
77 | Minute_Slider->setOrientation( QSlider::Horizontal ); | 77 | Minute_Slider->setOrientation( QSlider::Horizontal ); |
78 | connect(Minute_Slider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeMinute(int))); | 78 | connect(Minute_Slider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeMinute(int))); |
79 | 79 | ||
80 | Set_AlarmLayout->addMultiCellWidget( Minute_Slider, 2, 2, 1, 2 ); | 80 | Set_AlarmLayout->addMultiCellWidget( Minute_Slider, 2, 2, 1, 2 ); |
81 | 81 | ||
@@ -91,5 +91,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
91 | Am_RadioButton->setChecked(TRUE); | 91 | Am_RadioButton->setChecked(TRUE); |
92 | connect( Am_RadioButton, SIGNAL(toggled(bool)),this,SLOT( amButtonToggled(bool))); | 92 | connect( Am_RadioButton, SIGNAL(toggled(bool)),this,SLOT( amButtonToggled(bool))); |
93 | 93 | ||
94 | Set_AlarmLayout->addMultiCellWidget( Am_RadioButton, 0, 1, 3, 4 ); | 94 | Set_AlarmLayout->addMultiCellWidget( Am_RadioButton, 0, 1, 3, 4 ); |
95 | 95 | ||
@@ -98,5 +98,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
98 | Pm_RadioButton->setText( tr( "PM" ) ); | 98 | Pm_RadioButton->setText( tr( "PM" ) ); |
99 | connect( Pm_RadioButton, SIGNAL(toggled(bool)),this,SLOT( pmButtonToggled(bool))); | 99 | connect( Pm_RadioButton, SIGNAL(toggled(bool)),this,SLOT( pmButtonToggled(bool))); |
100 | 100 | ||
101 | Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 ); | 101 | Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 ); |
102 | 102 | ||
@@ -138,5 +138,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
138 | Hour_Slider->setMaxValue( 12); | 138 | Hour_Slider->setMaxValue( 12); |
139 | Hour_Slider->setMinValue( 1); | 139 | Hour_Slider->setMinValue( 1); |
140 | 140 | ||
141 | if( i_alarmHour > 12) { | 141 | if( i_alarmHour > 12) { |
142 | i_alarmHour = i_alarmHour - 12; | 142 | i_alarmHour = i_alarmHour - 12; |
@@ -144,6 +144,6 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
144 | } | 144 | } |
145 | else if ( i_alarmHour == 0 ) { | 145 | else if ( i_alarmHour == 0 ) { |
146 | i_alarmHour = 12; | 146 | i_alarmHour = 12; |
147 | } | 147 | } |
148 | Hour_Slider->setValue( i_alarmHour ); | 148 | Hour_Slider->setValue( i_alarmHour ); |
149 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); | 149 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); |
@@ -159,5 +159,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
159 | } | 159 | } |
160 | if( config.readBoolEntry("mp3Alarm") ) | 160 | if( config.readBoolEntry("mp3Alarm") ) |
161 | useMp3Check->setChecked(true); | 161 | useMp3Check->setChecked(true); |
162 | 162 | ||
163 | // signals and slots connections | 163 | // signals and slots connections |
@@ -210,6 +210,6 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { | |||
210 | text << "audio/*"; | 210 | text << "audio/*"; |
211 | map.insert(tr("Audio"), text ); | 211 | map.insert(tr("Audio"), text ); |
212 | QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); | 212 | QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); |
213 | // QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); | 213 | // QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); |
214 | if(!str.isEmpty() ) { | 214 | if(!str.isEmpty() ) { |
215 | qDebug(str); | 215 | qDebug(str); |