summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-08 23:18:38 (UTC)
committer zecke <zecke>2005-02-08 23:18:38 (UTC)
commit615923bafaffe90dd7c860d094f4cf3680b6d103 (patch) (unidiff)
tree0ac5fe38c6f5b568601eec24f7861aece2d6a01f
parent426e43a3d110cb09aa99f47da2a73f53ee5aad7e (diff)
downloadopie-615923bafaffe90dd7c860d094f4cf3680b6d103.zip
opie-615923bafaffe90dd7c860d094f4cf3680b6d103.tar.gz
opie-615923bafaffe90dd7c860d094f4cf3680b6d103.tar.bz2
Fix for #1550 start at QPEApplication::qpeDir() + "sounds/"
as basedirectory
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 0ad69d9..3473d01 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -1,45 +1,45 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
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// changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 20// changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002
21// changes added and Copyright (C) by Holger Freyther 2004 21// changes added and Copyright (C) by Holger Freyther 2004,2005
22 22
23#include "clock.h" 23#include "clock.h"
24 24
25#include "analogclock.h" 25#include "analogclock.h"
26 26
27#include <qtabwidget.h> 27#include <qtabwidget.h>
28 28
29#include <opie2/ofiledialog.h> 29#include <opie2/ofiledialog.h>
30 30
31#include <qpe/qpeapplication.h> 31#include <qpe/qpeapplication.h>
32#include <qpe/qcopenvelope_qws.h> 32#include <qpe/qcopenvelope_qws.h>
33#include <qpe/config.h> 33#include <qpe/config.h>
34#include <qpe/timestring.h> 34#include <qpe/timestring.h>
35#include <qpe/alarmserver.h> 35#include <qpe/alarmserver.h>
36#include <qpe/sound.h> 36#include <qpe/sound.h>
37#include <qpe/resource.h> 37#include <qpe/resource.h>
38#include <qsound.h> 38#include <qsound.h>
39#include <qtimer.h> 39#include <qtimer.h>
40 40
41 41
42 42
43#include <qlcdnumber.h> 43#include <qlcdnumber.h>
44#include <qslider.h> 44#include <qslider.h>
45#include <qlabel.h> 45#include <qlabel.h>
@@ -780,32 +780,32 @@ bool Clock::spinBoxValid( QSpinBox *sb )
780 QString tv = sb->text(); 780 QString tv = sb->text();
781 for ( uint i = 0; i < tv.length(); i++ ) { 781 for ( uint i = 0; i < tv.length(); i++ ) {
782 if ( !tv[0].isDigit() ) 782 if ( !tv[0].isDigit() )
783 valid = FALSE; 783 valid = FALSE;
784 } 784 }
785 bool ok = FALSE; 785 bool ok = FALSE;
786 int v = tv.toInt( &ok ); 786 int v = tv.toInt( &ok );
787 if ( !ok ) 787 if ( !ok )
788 valid = FALSE; 788 valid = FALSE;
789 if ( v < sb->minValue() || v > sb->maxValue() ) 789 if ( v < sb->minValue() || v > sb->maxValue() )
790 valid = FALSE; 790 valid = FALSE;
791 791
792 return valid; 792 return valid;
793} 793}
794 794
795void Clock::slotBrowseMp3File() { 795void Clock::slotBrowseMp3File() {
796 Config config( "qpe" ); 796 Config config( "qpe" );
797 config.setGroup("Time"); 797 config.setGroup("Time");
798 798
799 QMap<QString, QStringList> map; 799 QMap<QString, QStringList> map;
800 map.insert(tr("All"), QStringList() ); 800 map.insert(tr("All"), QStringList() );
801 QStringList text; 801 QStringList text;
802 text << "audio/*"; 802 text << "audio/*";
803 map.insert(tr("Audio"), text ); 803 map.insert(tr("Audio"), text );
804 QString str = Opie::Ui::OFileDialog::getOpenFileName( 2,"/", QString::null, map); 804 QString str = Opie::Ui::OFileDialog::getOpenFileName( 2, QPEApplication::qpeDir() + "sounds/", QString::null, map);
805 if(!str.isEmpty() ) { 805 if(!str.isEmpty() ) {
806 config.writeEntry("mp3Alarm",1); 806 config.writeEntry("mp3Alarm",1);
807 config.writeEntry("mp3File",str); 807 config.writeEntry("mp3File",str);
808 sndFileName->setText( str ); 808 sndFileName->setText( str );
809 scheduleApplyDailyAlarm(); 809 scheduleApplyDailyAlarm();
810 } 810 }
811} 811}