summaryrefslogtreecommitdiff
Unidiff
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 @@
1CONFIG = qt warn_on release quick-app 1CONFIG = qt warn_on release quick-app
2HEADERS = clock.h setAlarm.h 2HEADERS = clock.h setAlarm.h
3SOURCES = clock.cpp setAlarm.cpp \ 3SOURCES = 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
@@ -11,17 +11,16 @@
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
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
@@ -1,10 +1,10 @@
1Package: opie-clock 1Package: opie-clock
2Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop 2Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
3Priority: optional 3Priority: 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
@@ -1,58 +1,58 @@
1 /*************************************************************************** 1 /***************************************************************************
2// setAlarm.cpp - description 2// setAlarm.cpp - description
3// ------------------- 3// -------------------
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 *
11 * the Free Software Foundation; either version 2 of the License, or * 11 * the Free Software Foundation; either version 2 of the License, or *
12 * (at your option) any later version. * 12 * (at your option) any later version. *
13 ***************************************************************************/ 13 ***************************************************************************/
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>
22#include <qstring.h> 22#include <qstring.h>
23#include <qlabel.h> 23#include <qlabel.h>
24#include <qlcdnumber.h> 24#include <qlcdnumber.h>
25#include <qpushbutton.h> 25#include <qpushbutton.h>
26#include <qradiobutton.h> 26#include <qradiobutton.h>
27#include <qslider.h> 27#include <qslider.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#include <qvariant.h> 29#include <qvariant.h>
30#include <qtooltip.h> 30#include <qtooltip.h>
31#include <qwhatsthis.h> 31#include <qwhatsthis.h>
32#include <qbuttongroup.h> 32#include <qbuttongroup.h>
33#include <qcheckbox.h> 33#include <qcheckbox.h>
34 34
35Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) 35Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl )
36 : QDialog( parent, name, modal, fl ) 36 : QDialog( parent, name, modal, 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
50 TextLabel1 = new QLabel( this, "TextLabel1" ); 50 TextLabel1 = new QLabel( this, "TextLabel1" );
51 TextLabel1->setText( tr( "Hour" ) ); 51 TextLabel1->setText( tr( "Hour" ) );
52 52
53 Set_AlarmLayout->addWidget( TextLabel1, 0, 0 ); 53 Set_AlarmLayout->addWidget( TextLabel1, 0, 0 );
54 54
55 TextLabel2 = new QLabel( this, "TextLabel2" ); 55 TextLabel2 = new QLabel( this, "TextLabel2" );
56 TextLabel2->setText( tr( "Minute" ) ); 56 TextLabel2->setText( tr( "Minute" ) );
57 57
58 Set_AlarmLayout->addMultiCellWidget( TextLabel2, 0, 0, 1, 2 ); 58 Set_AlarmLayout->addMultiCellWidget( TextLabel2, 0, 0, 1, 2 );
@@ -67,46 +67,46 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
67 Hour_LCDNumber = new QLCDNumber( this, "Hour_LCDNumber" ); 67 Hour_LCDNumber = new QLCDNumber( this, "Hour_LCDNumber" );
68 Hour_LCDNumber->setFrameShape( QLCDNumber::Box ); 68 Hour_LCDNumber->setFrameShape( QLCDNumber::Box );
69 Hour_LCDNumber->setFrameShadow( QLCDNumber::Plain ); 69 Hour_LCDNumber->setFrameShadow( QLCDNumber::Plain );
70 Hour_LCDNumber->setSegmentStyle( QLCDNumber::Flat ); 70 Hour_LCDNumber->setSegmentStyle( QLCDNumber::Flat );
71 71
72 Set_AlarmLayout->addWidget( Hour_LCDNumber, 1, 0 ); 72 Set_AlarmLayout->addWidget( Hour_LCDNumber, 1, 0 );
73 73
74 Minute_Slider = new QSlider( this, "Minute_Slider" ); 74 Minute_Slider = new QSlider( this, "Minute_Slider" );
75 Minute_Slider->setMaxValue( 59); 75 Minute_Slider->setMaxValue( 59);
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" );
83 Minute_LCDNumber->setFrameShape( QLCDNumber::Box ); 83 Minute_LCDNumber->setFrameShape( QLCDNumber::Box );
84 Minute_LCDNumber->setFrameShadow( QLCDNumber::Plain ); 84 Minute_LCDNumber->setFrameShadow( QLCDNumber::Plain );
85 Minute_LCDNumber->setSegmentStyle( QLCDNumber::Flat ); 85 Minute_LCDNumber->setSegmentStyle( QLCDNumber::Flat );
86 86
87 Set_AlarmLayout->addMultiCellWidget( Minute_LCDNumber, 1, 1, 1, 2 ); 87 Set_AlarmLayout->addMultiCellWidget( Minute_LCDNumber, 1, 1, 1, 2 );
88 88
89 Am_RadioButton = new QRadioButton( this, "Am_RadioButton" ); 89 Am_RadioButton = new QRadioButton( this, "Am_RadioButton" );
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 );
104 useMp3Check-> setFocusPolicy ( QWidget::NoFocus ); 104 useMp3Check-> setFocusPolicy ( QWidget::NoFocus );
105 Set_AlarmLayout->addMultiCellWidget( useMp3Check, 2, 3, 3, 4 ); 105 Set_AlarmLayout->addMultiCellWidget( useMp3Check, 2, 3, 3, 4 );
106 106
107 107
108 108
109 TextLabel3 = new QLabel( this, "TextLabel3" ); 109 TextLabel3 = new QLabel( this, "TextLabel3" );
110 TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) ); 110 TextLabel3->setText( tr( "Snooze Delay\n(minutes)" ) );
111 111
112 Set_AlarmLayout->addMultiCellWidget( TextLabel3, 3, 3, 0, 1 ); 112 Set_AlarmLayout->addMultiCellWidget( TextLabel3, 3, 3, 0, 1 );
@@ -128,46 +128,46 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
128 Config config( "qpe" ); 128 Config config( "qpe" );
129 config.setGroup("Time"); 129 config.setGroup("Time");
130 130
131 bool ok; 131 bool ok;
132 bool ampm = config.readBoolEntry( "AMPM", TRUE ); 132 bool ampm = config.readBoolEntry( "AMPM", TRUE );
133 QString alarmHour=config.readEntry("clockAlarmHour","8"); 133 QString alarmHour=config.readEntry("clockAlarmHour","8");
134 int i_alarmHour = alarmHour.toInt(&ok,10); 134 int i_alarmHour = alarmHour.toInt(&ok,10);
135 QString alarmMinute=config.readEntry("clockAlarmMinute","0"); 135 QString alarmMinute=config.readEntry("clockAlarmMinute","0");
136 QString snoozeTime=config.readEntry("clockAlarmSnooze","0"); 136 QString snoozeTime=config.readEntry("clockAlarmSnooze","0");
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) );
151 } else { 151 } else {
152 Hour_Slider->setMaxValue( 23); 152 Hour_Slider->setMaxValue( 23);
153 Hour_Slider->setMinValue( 0); 153 Hour_Slider->setMinValue( 0);
154 Hour_Slider->setValue( i_alarmHour); 154 Hour_Slider->setValue( i_alarmHour);
155 Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); 155 Minute_Slider->setValue( alarmMinute.toInt(&ok,10) );
156 SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); 156 SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
157 Am_RadioButton->hide(); 157 Am_RadioButton->hide();
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)));
165} 165}
166 166
167Set_Alarm::~Set_Alarm() 167Set_Alarm::~Set_Alarm()
168{ 168{
169 169
170} 170}
171 171
172void Set_Alarm::slotChangeHour(int hour) 172void Set_Alarm::slotChangeHour(int hour)
173{ 173{
@@ -200,24 +200,24 @@ void Set_Alarm::cleanUp()
200{ 200{
201} 201}
202 202
203void Set_Alarm::slotChangemp3CkeckBox(bool b) { 203void Set_Alarm::slotChangemp3CkeckBox(bool b) {
204 Config config( "qpe" ); 204 Config config( "qpe" );
205 config.setGroup("Time"); 205 config.setGroup("Time");
206 if(b) { 206 if(b) {
207 QMap<QString, QStringList> map; 207 QMap<QString, QStringList> map;
208 map.insert(tr("All"), QStringList() ); 208 map.insert(tr("All"), QStringList() );
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);
217 config.writeEntry("mp3File",str); 217 config.writeEntry("mp3File",str);
218 } 218 }
219 } else { 219 } else {
220 config.writeEntry("mp3Alarm",0); 220 config.writeEntry("mp3Alarm",0);
221 config.writeEntry("mp3File",""); 221 config.writeEntry("mp3File","");
222 } 222 }
223} 223}