summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 23:27:16 (UTC)
committer drw <drw>2004-03-02 23:27:16 (UTC)
commit7cd53bb0080e8156914a3fd5f0666b47a8619df1 (patch) (unidiff)
treed5dcc02cdebd1b1f6fdb09f95b01ce3fa0c9675a
parent8283412db56bdbbff6df3aad0c5d6df100c9e4b6 (diff)
downloadopie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.zip
opie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.tar.gz
opie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.tar.bz2
Clock: libopie -> libopie2
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
@@ -4,7 +4,7 @@ SOURCES = clock.cpp setAlarm.cpp \
4 main.cpp 4 main.cpp
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe -lopie -lpthread 7LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread
8TARGET = clock 8TARGET = clock
9 9
10include ( $(OPIEDIR)/include.pro ) 10include ( $(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 @@
1 config CLOCK 1 config CLOCK
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
@@ -20,8 +20,7 @@
20 20
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
27OPIE_EXPORT_APP( OApplicationFactory<Clock> ) 26OPIE_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
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopieui2
8Description: Clock and stop-watch 8Description: 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.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $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 @@
4// Created: Wed Mar 13 19:47:24 2002 4// Created: Wed Mar 13 19:47:24 2002
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 *
10 * it under the terms of the GNU General Public License as published by * 10 * it under the terms of the GNU General Public License as published by *
@@ -14,8 +14,8 @@
14 14
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>
21#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
@@ -37,13 +37,13 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
37{ 37{
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);
43 setCaption( tr( "Set Alarm" ) ); 43 setCaption( tr( "Set Alarm" ) );
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 );
49 49
@@ -76,7 +76,7 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
76 Minute_Slider->setPageStep( 1); 76 Minute_Slider->setPageStep( 1);
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
82 Minute_LCDNumber = new QLCDNumber( this, "Minute_LCDNumber" ); 82 Minute_LCDNumber = new QLCDNumber( this, "Minute_LCDNumber" );
@@ -90,14 +90,14 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
90 Am_RadioButton->setText( tr( "AM" ) ); 90 Am_RadioButton->setText( tr( "AM" ) );
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
96 96
97 Pm_RadioButton = new QRadioButton( this, "Pm_RadioButton" ); 97 Pm_RadioButton = new QRadioButton( this, "Pm_RadioButton" );
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
103 useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this ); 103 useMp3Check = new QCheckBox ( tr( "mp3 alarm" ), this );
@@ -137,14 +137,14 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
137 if(ampm) { 137 if(ampm) {
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;
143 Pm_RadioButton->setChecked(TRUE); 143 Pm_RadioButton->setChecked(TRUE);
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) );
150 SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); 150 SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
@@ -158,7 +158,7 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
158 Pm_RadioButton->hide(); 158 Pm_RadioButton->hide();
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
164 connect(useMp3Check,SIGNAL(toggled(bool)),this,SLOT(slotChangemp3CkeckBox(bool))); 164 connect(useMp3Check,SIGNAL(toggled(bool)),this,SLOT(slotChangemp3CkeckBox(bool)));
@@ -209,8 +209,8 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
209 QStringList text; 209 QStringList text;
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);
216 config.writeEntry("mp3Alarm",1); 216 config.writeEntry("mp3Alarm",1);