-rw-r--r-- | core/settings/citytime/citytime.cpp | 5 | ||||
-rw-r--r-- | core/settings/citytime/citytimebase.cpp | 3 | ||||
-rw-r--r-- | core/settings/citytime/main.cpp | 1 | ||||
-rw-r--r-- | core/settings/citytime/stylusnormalizer.cpp | 1 | ||||
-rw-r--r-- | core/settings/citytime/zonemap.cpp | 7 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 1 | ||||
-rw-r--r-- | libqtaux/ocolorbutton.cpp | 3 | ||||
-rw-r--r-- | libqtaux/ocolorpopupmenu.cpp | 1 | ||||
-rw-r--r-- | libqtaux/qcolordialog.cpp | 2 | ||||
-rw-r--r-- | libqtaux/qinputdialog.cpp | 1 | ||||
-rw-r--r-- | libqtaux/qsplitter.cpp | 4 |
11 files changed, 0 insertions, 29 deletions
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp index b359ae1..e7f0c46 100644 --- a/core/settings/citytime/citytime.cpp +++ b/core/settings/citytime/citytime.cpp | |||
@@ -1,71 +1,66 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | 20 | ||
21 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 21 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
22 | 22 | ||
23 | #include "zonemap.h" | 23 | #include "zonemap.h" |
24 | #include "citytime.h" | 24 | #include "citytime.h" |
25 | 25 | ||
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #include <qpe/timestring.h> | ||
29 | #include <qpe/tzselect.h> | 28 | #include <qpe/tzselect.h> |
30 | #if !defined(QT_NO_COP) | 29 | #if !defined(QT_NO_COP) |
31 | #include <qpe/qcopenvelope_qws.h> | 30 | #include <qpe/qcopenvelope_qws.h> |
32 | #endif | 31 | #endif |
33 | 32 | ||
34 | #include <qdir.h> | ||
35 | #include <qfile.h> | ||
36 | #include <qlabel.h> | 33 | #include <qlabel.h> |
37 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
38 | #include <qregexp.h> | ||
39 | #include <qtextstream.h> | ||
40 | #include <qtoolbutton.h> | 35 | #include <qtoolbutton.h> |
41 | #include <qlayout.h> | 36 | #include <qlayout.h> |
42 | 37 | ||
43 | #include <stdlib.h> | 38 | #include <stdlib.h> |
44 | 39 | ||
45 | CityTime::CityTime( QWidget *parent, const char* name, | 40 | CityTime::CityTime( QWidget *parent, const char* name, |
46 | WFlags fl ) | 41 | WFlags fl ) |
47 | : CityTimeBase( parent, name, fl ), | 42 | : CityTimeBase( parent, name, fl ), |
48 | strRealTz(0), | 43 | strRealTz(0), |
49 | bAdded(false) | 44 | bAdded(false) |
50 | { | 45 | { |
51 | Config config( "qpe" ); | 46 | Config config( "qpe" ); |
52 | config.setGroup( "Time" ); | 47 | config.setGroup( "Time" ); |
53 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); | 48 | bWhichClock = config.readBoolEntry( "AMPM", TRUE ); |
54 | qDebug( QString("%1").arg(bWhichClock) ); | 49 | qDebug( QString("%1").arg(bWhichClock) ); |
55 | frmMap->changeClock( bWhichClock ); | 50 | frmMap->changeClock( bWhichClock ); |
56 | 51 | ||
57 | char *pEnv; | 52 | char *pEnv; |
58 | pEnv = NULL; | 53 | pEnv = NULL; |
59 | pEnv = getenv("TZ"); | 54 | pEnv = getenv("TZ"); |
60 | if ( pEnv ) | 55 | if ( pEnv ) |
61 | strRealTz = pEnv; | 56 | strRealTz = pEnv; |
62 | pEnv = NULL; | 57 | pEnv = NULL; |
63 | pEnv = getenv("HOME"); | 58 | pEnv = getenv("HOME"); |
64 | if ( pEnv ) | 59 | if ( pEnv ) |
65 | strHome = pEnv; | 60 | strHome = pEnv; |
66 | // append the labels to their respective lists... | 61 | // append the labels to their respective lists... |
67 | listCities.setAutoDelete( true ); | 62 | listCities.setAutoDelete( true ); |
68 | listTimes.setAutoDelete( true ); | 63 | listTimes.setAutoDelete( true ); |
69 | 64 | ||
70 | listCities.append( cmdCity1 ); | 65 | listCities.append( cmdCity1 ); |
71 | listCities.append( cmdCity2 ); | 66 | listCities.append( cmdCity2 ); |
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp index d734cf3..a3483cc 100644 --- a/core/settings/citytime/citytimebase.cpp +++ b/core/settings/citytime/citytimebase.cpp | |||
@@ -1,45 +1,42 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 3 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
4 | 4 | ||
5 | #include "citytimebase.h" | 5 | #include "citytimebase.h" |
6 | 6 | ||
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qpushbutton.h> | ||
9 | #include <qtoolbutton.h> | 8 | #include <qtoolbutton.h> |
10 | #include "zonemap.h" | 9 | #include "zonemap.h" |
11 | #include <qlayout.h> | 10 | #include <qlayout.h> |
12 | #include <qvariant.h> | ||
13 | #include <qtooltip.h> | ||
14 | #include <qwhatsthis.h> | 11 | #include <qwhatsthis.h> |
15 | 12 | ||
16 | 13 | ||
17 | /* | 14 | /* |
18 | * Constructs a CityTimeBase which is a child of 'parent', with the | 15 | * Constructs a CityTimeBase which is a child of 'parent', with the |
19 | * name 'name' and widget flags set to 'f' | 16 | * name 'name' and widget flags set to 'f' |
20 | */ | 17 | */ |
21 | CityTimeBase::CityTimeBase( QWidget* parent, const char* name, WFlags ) | 18 | CityTimeBase::CityTimeBase( QWidget* parent, const char* name, WFlags ) |
22 | : QWidget( parent, name, WStyle_ContextHelp ) | 19 | : QWidget( parent, name, WStyle_ContextHelp ) |
23 | { | 20 | { |
24 | if ( !name ) | 21 | if ( !name ) |
25 | setName( "CityTimeBase" ); | 22 | setName( "CityTimeBase" ); |
26 | setCaption( tr( "City Time" ) ); | 23 | setCaption( tr( "City Time" ) ); |
27 | CityTimeBaseLayout = new QVBoxLayout( this ); | 24 | CityTimeBaseLayout = new QVBoxLayout( this ); |
28 | CityTimeBaseLayout->setSpacing( 3 ); | 25 | CityTimeBaseLayout->setSpacing( 3 ); |
29 | CityTimeBaseLayout->setMargin( 0 ); | 26 | CityTimeBaseLayout->setMargin( 0 ); |
30 | 27 | ||
31 | frmMap = new ZoneMap( this, "frmMap" ); | 28 | frmMap = new ZoneMap( this, "frmMap" ); |
32 | frmMap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, frmMap->sizePolicy().hasHeightForWidth() ) ); | 29 | frmMap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, frmMap->sizePolicy().hasHeightForWidth() ) ); |
33 | CityTimeBaseLayout->addWidget( frmMap ); | 30 | CityTimeBaseLayout->addWidget( frmMap ); |
34 | 31 | ||
35 | buttonWidget = new QWidget( this ); | 32 | buttonWidget = new QWidget( this ); |
36 | QWhatsThis::add( buttonWidget, tr( "Click on one of the set cities to replace it" ) ); | 33 | QWhatsThis::add( buttonWidget, tr( "Click on one of the set cities to replace it" ) ); |
37 | Layout2 = new QGridLayout( buttonWidget ); | 34 | Layout2 = new QGridLayout( buttonWidget ); |
38 | Layout2->setSpacing( 3 ); | 35 | Layout2->setSpacing( 3 ); |
39 | Layout2->setMargin( 4 ); | 36 | Layout2->setMargin( 4 ); |
40 | 37 | ||
41 | cmdCity7 = new QToolButton( buttonWidget, "cmdCity7" ); | 38 | cmdCity7 = new QToolButton( buttonWidget, "cmdCity7" ); |
42 | cmdCity7->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)1, cmdCity7->sizePolicy().hasHeightForWidth() ) ); | 39 | cmdCity7->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)1, cmdCity7->sizePolicy().hasHeightForWidth() ) ); |
43 | QFont cmdCity7_font( cmdCity7->font() ); | 40 | QFont cmdCity7_font( cmdCity7->font() ); |
44 | cmdCity7_font.setBold( TRUE ); | 41 | cmdCity7_font.setBold( TRUE ); |
45 | cmdCity7->setFont( cmdCity7_font ); | 42 | cmdCity7->setFont( cmdCity7_font ); |
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index 69bfe44..59498b7 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp | |||
@@ -1,25 +1,24 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | 20 | ||
21 | #include "citytime.h" | 21 | #include "citytime.h" |
22 | #include <qpe/qpeapplication.h> | ||
23 | #include <opie/oapplicationfactory.h> | 22 | #include <opie/oapplicationfactory.h> |
24 | 23 | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) |
diff --git a/core/settings/citytime/stylusnormalizer.cpp b/core/settings/citytime/stylusnormalizer.cpp index c6c65d2..281a0bc 100644 --- a/core/settings/citytime/stylusnormalizer.cpp +++ b/core/settings/citytime/stylusnormalizer.cpp | |||
@@ -1,53 +1,52 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | 20 | ||
21 | #include <qpoint.h> | ||
22 | #include <qtimer.h> | 21 | #include <qtimer.h> |
23 | 22 | ||
24 | #include "stylusnormalizer.h" | 23 | #include "stylusnormalizer.h" |
25 | 24 | ||
26 | static const int FLUSHTIME = 100; | 25 | static const int FLUSHTIME = 100; |
27 | 26 | ||
28 | _StylusEvent::_StylusEvent( const QPoint& newPt ) | 27 | _StylusEvent::_StylusEvent( const QPoint& newPt ) |
29 | : _pt( newPt ), | 28 | : _pt( newPt ), |
30 | _t( QTime::currentTime() ) | 29 | _t( QTime::currentTime() ) |
31 | { | 30 | { |
32 | } | 31 | } |
33 | 32 | ||
34 | _StylusEvent::~_StylusEvent() | 33 | _StylusEvent::~_StylusEvent() |
35 | { | 34 | { |
36 | } | 35 | } |
37 | 36 | ||
38 | StylusNormalizer::StylusNormalizer( QWidget *parent, const char* name ) | 37 | StylusNormalizer::StylusNormalizer( QWidget *parent, const char* name ) |
39 | : QWidget( parent, name ), | 38 | : QWidget( parent, name ), |
40 | _next( 0 ), | 39 | _next( 0 ), |
41 | bFirst( true ) | 40 | bFirst( true ) |
42 | { | 41 | { |
43 | // initialize _ptList | 42 | // initialize _ptList |
44 | int i; | 43 | int i; |
45 | for (i = 0; i < SAMPLES; i++ ) { | 44 | for (i = 0; i < SAMPLES; i++ ) { |
46 | _ptList[i].setPoint( -1, -1 ); | 45 | _ptList[i].setPoint( -1, -1 ); |
47 | } | 46 | } |
48 | _tExpire = new QTimer( this ); | 47 | _tExpire = new QTimer( this ); |
49 | QObject::connect( _tExpire, SIGNAL( timeout() ), | 48 | QObject::connect( _tExpire, SIGNAL( timeout() ), |
50 | this, SLOT( slotAveragePoint() ) ); | 49 | this, SLOT( slotAveragePoint() ) ); |
51 | } | 50 | } |
52 | 51 | ||
53 | StylusNormalizer::~StylusNormalizer() | 52 | StylusNormalizer::~StylusNormalizer() |
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp index 872e786..b83da59 100644 --- a/core/settings/citytime/zonemap.cpp +++ b/core/settings/citytime/zonemap.cpp | |||
@@ -1,70 +1,63 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 | 20 | ||
21 | // changes by Maximilian Reiss <harlekin@handhelds.org> | 21 | // changes by Maximilian Reiss <harlekin@handhelds.org> |
22 | 22 | ||
23 | #include "sun.h" | 23 | #include "sun.h" |
24 | #include "zonemap.h" | 24 | #include "zonemap.h" |
25 | 25 | ||
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | #include <qpe/timestring.h> | ||
28 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
29 | 28 | ||
30 | #include <qdatetime.h> | ||
31 | #include <qfile.h> | 29 | #include <qfile.h> |
32 | #include <qimage.h> | ||
33 | #include <qlabel.h> | 30 | #include <qlabel.h> |
34 | #include <qlist.h> | ||
35 | #include <qmessagebox.h> | 31 | #include <qmessagebox.h> |
36 | #include <qpixmap.h> | ||
37 | #include <qpainter.h> | ||
38 | #include <qregexp.h> | ||
39 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
40 | #include <qtimer.h> | 33 | #include <qtimer.h> |
41 | #include <qtoolbutton.h> | 34 | #include <qtoolbutton.h> |
42 | #include <qlayout.h> | 35 | #include <qlayout.h> |
43 | #include <qhbox.h> | 36 | #include <qhbox.h> |
44 | #include <qlistview.h> | 37 | #include <qlistview.h> |
45 | #include <qwhatsthis.h> | 38 | #include <qwhatsthis.h> |
46 | 39 | ||
47 | #include <limits.h> | 40 | #include <limits.h> |
48 | 41 | ||
49 | // the map file... | 42 | // the map file... |
50 | static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab"; | 43 | static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab"; |
51 | static const char strMAP[] = "citytime/simple_grid_400"; | 44 | static const char strMAP[] = "citytime/simple_grid_400"; |
52 | 45 | ||
53 | // the maximum distance we'll allow the pointer to be away from a city | 46 | // the maximum distance we'll allow the pointer to be away from a city |
54 | // and still show the city's time | 47 | // and still show the city's time |
55 | static const int iTHRESHOLD = 50000; | 48 | static const int iTHRESHOLD = 50000; |
56 | 49 | ||
57 | // The label offset (how far away from pointer) | 50 | // The label offset (how far away from pointer) |
58 | static const int iLABELOFFSET = 8; | 51 | static const int iLABELOFFSET = 8; |
59 | 52 | ||
60 | // the size of the dot to draw, and where to start it | 53 | // the size of the dot to draw, and where to start it |
61 | static const int iCITYSIZE = 3; | 54 | static const int iCITYSIZE = 3; |
62 | const int iCITYOFFSET = 2; | 55 | const int iCITYOFFSET = 2; |
63 | 56 | ||
64 | // the darkening function | 57 | // the darkening function |
65 | static inline void darken( QImage *pImage, int start, int stop, int row ); | 58 | static inline void darken( QImage *pImage, int start, int stop, int row ); |
66 | static void dayNight( QImage *pImage ); | 59 | static void dayNight( QImage *pImage ); |
67 | 60 | ||
68 | ZoneField::ZoneField( const QString& strLine ) | 61 | ZoneField::ZoneField( const QString& strLine ) |
69 | { | 62 | { |
70 | // make a bunch of RegExp's to match the data from the line | 63 | // make a bunch of RegExp's to match the data from the line |
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 60f7417..4baff8e 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -4,65 +4,64 @@ | |||
4 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 4 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "light.h" | 29 | #include "light.h" |
30 | 30 | ||
31 | #include <qpe/config.h> | 31 | #include <qpe/config.h> |
32 | #include <qpe/power.h> | 32 | #include <qpe/power.h> |
33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
34 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
35 | #endif | 35 | #endif |
36 | #include <qpe/qpeapplication.h> | ||
37 | 36 | ||
38 | #include <qlabel.h> | 37 | #include <qlabel.h> |
39 | #include <qcheckbox.h> | 38 | #include <qcheckbox.h> |
40 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
41 | #include <qslider.h> | 40 | #include <qslider.h> |
42 | #include <qspinbox.h> | 41 | #include <qspinbox.h> |
43 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
44 | #include <qgroupbox.h> | 43 | #include <qgroupbox.h> |
45 | #include <qcombobox.h> | 44 | #include <qcombobox.h> |
46 | 45 | ||
47 | #include <opie/odevice.h> | 46 | #include <opie/odevice.h> |
48 | 47 | ||
49 | #include "sensor.h" | 48 | #include "sensor.h" |
50 | 49 | ||
51 | using namespace Opie; | 50 | using namespace Opie; |
52 | 51 | ||
53 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | 52 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) |
54 | : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) | 53 | : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) |
55 | { | 54 | { |
56 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); | 55 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); |
57 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); | 56 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); |
58 | 57 | ||
59 | // check whether to show the light sensor stuff | 58 | // check whether to show the light sensor stuff |
60 | 59 | ||
61 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { | 60 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { |
62 | auto_brightness-> hide ( ); | 61 | auto_brightness-> hide ( ); |
63 | CalibrateLightSensor-> hide ( ); | 62 | CalibrateLightSensor-> hide ( ); |
64 | auto_brightness_ac-> hide ( ); | 63 | auto_brightness_ac-> hide ( ); |
65 | CalibrateLightSensor_ac-> hide ( ); | 64 | CalibrateLightSensor_ac-> hide ( ); |
66 | } | 65 | } |
67 | 66 | ||
68 | // check whether to show the contrast stuff | 67 | // check whether to show the contrast stuff |
diff --git a/libqtaux/ocolorbutton.cpp b/libqtaux/ocolorbutton.cpp index d2ad873..fd3f963 100644 --- a/libqtaux/ocolorbutton.cpp +++ b/libqtaux/ocolorbutton.cpp | |||
@@ -2,69 +2,66 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) Robert Griebl <sandman@handhelds.org> | 3 | Copyright (C) Robert Griebl <sandman@handhelds.org> |
4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "ocolorpopupmenu.h" | 30 | #include "ocolorpopupmenu.h" |
31 | #include "ocolorbutton.h" | 31 | #include "ocolorbutton.h" |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <qpe/resource.h> | ||
35 | 34 | ||
36 | /* QT */ | 35 | /* QT */ |
37 | #include <qcolor.h> | ||
38 | #include <qpixmap.h> | ||
39 | #include <qimage.h> | 36 | #include <qimage.h> |
40 | 37 | ||
41 | using namespace Opie; | 38 | using namespace Opie; |
42 | 39 | ||
43 | struct OColorButtonPrivate | 40 | struct OColorButtonPrivate |
44 | { | 41 | { |
45 | QPopupMenu *m_menu; | 42 | QPopupMenu *m_menu; |
46 | QColor m_color; | 43 | QColor m_color; |
47 | }; | 44 | }; |
48 | 45 | ||
49 | /** | 46 | /** |
50 | * This concstructs a Color Button with @param color as the start color | 47 | * This concstructs a Color Button with @param color as the start color |
51 | * It'll use a OColorPopupMenu internally | 48 | * It'll use a OColorPopupMenu internally |
52 | * | 49 | * |
53 | * @param parent The parent of the Color Button | 50 | * @param parent The parent of the Color Button |
54 | * @param color The color from where to start on | 51 | * @param color The color from where to start on |
55 | * @param name @see QObject | 52 | * @param name @see QObject |
56 | */ | 53 | */ |
57 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) | 54 | OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) |
58 | : QPushButton ( parent, name ) | 55 | : QPushButton ( parent, name ) |
59 | { | 56 | { |
60 | d = new OColorButtonPrivate; | 57 | d = new OColorButtonPrivate; |
61 | 58 | ||
62 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); | 59 | d-> m_menu = new OColorPopupMenu ( color, 0, 0 ); |
63 | setPopup ( d-> m_menu ); | 60 | setPopup ( d-> m_menu ); |
64 | //setPopupDelay ( 0 ); | 61 | //setPopupDelay ( 0 ); |
65 | connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & ))); | 62 | connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & ))); |
66 | 63 | ||
67 | updateColor ( color ); | 64 | updateColor ( color ); |
68 | 65 | ||
69 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); | 66 | QSize s = sizeHint ( ) + QSize ( 12, 0 ); |
70 | setMinimumSize ( s ); | 67 | setMinimumSize ( s ); |
diff --git a/libqtaux/ocolorpopupmenu.cpp b/libqtaux/ocolorpopupmenu.cpp index 6c5f99c..c5b2b88 100644 --- a/libqtaux/ocolorpopupmenu.cpp +++ b/libqtaux/ocolorpopupmenu.cpp | |||
@@ -5,65 +5,64 @@ | |||
5 | Dan Williams <williamsdr@acm.org> | 5 | Dan Williams <williamsdr@acm.org> |
6 | =. | 6 | =. |
7 | .=l. | 7 | .=l. |
8 | .>+-= | 8 | .>+-= |
9 | _;:, .> :=|. This program is free software; you can | 9 | _;:, .> :=|. This program is free software; you can |
10 | .> <`_, > . <= redistribute it and/or modify it under | 10 | .> <`_, > . <= redistribute it and/or modify it under |
11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
12 | .="- .-=="i, .._ License as published by the Free Software | 12 | .="- .-=="i, .._ License as published by the Free Software |
13 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | - . .-<_> .<> Foundation; either version 2 of the License, |
14 | ._= =} : or (at your option) any later version. | 14 | ._= =} : or (at your option) any later version. |
15 | .%`+i> _;_. | 15 | .%`+i> _;_. |
16 | .i_,=:_. -<s. This program is distributed in the hope that | 16 | .i_,=:_. -<s. This program is distributed in the hope that |
17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
18 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
22 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
23 | : = ...= . :.=- | 23 | : = ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | 30 | ||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "ocolorpopupmenu.h" | 33 | #include "ocolorpopupmenu.h" |
34 | #include "qcolordialog.h" | 34 | #include "qcolordialog.h" |
35 | 35 | ||
36 | /* QT */ | 36 | /* QT */ |
37 | #include <qaction.h> | ||
38 | #include <qlayout.h> | 37 | #include <qlayout.h> |
39 | #include <qpainter.h> | 38 | #include <qpainter.h> |
40 | 39 | ||
41 | using namespace Opie; | 40 | using namespace Opie; |
42 | 41 | ||
43 | OColorPanelButton::OColorPanelButton( const QColor& color, QWidget* parent, const char* name ) | 42 | OColorPanelButton::OColorPanelButton( const QColor& color, QWidget* parent, const char* name ) |
44 | : QFrame( parent, name ) | 43 | : QFrame( parent, name ) |
45 | { | 44 | { |
46 | m_color = color; | 45 | m_color = color; |
47 | 46 | ||
48 | setFixedSize( 16, 16 ); | 47 | setFixedSize( 16, 16 ); |
49 | setActive( FALSE ); | 48 | setActive( FALSE ); |
50 | } | 49 | } |
51 | 50 | ||
52 | OColorPanelButton::~OColorPanelButton() | 51 | OColorPanelButton::~OColorPanelButton() |
53 | { | 52 | { |
54 | } | 53 | } |
55 | 54 | ||
56 | void OColorPanelButton::setActive( bool active ) | 55 | void OColorPanelButton::setActive( bool active ) |
57 | { | 56 | { |
58 | m_active = active; | 57 | m_active = active; |
59 | 58 | ||
60 | if ( m_active ) { | 59 | if ( m_active ) { |
61 | setFrameStyle( Panel | Sunken ); | 60 | setFrameStyle( Panel | Sunken ); |
62 | } else { | 61 | } else { |
63 | setFrameStyle( NoFrame ); | 62 | setFrameStyle( NoFrame ); |
64 | } | 63 | } |
65 | } | 64 | } |
66 | 65 | ||
67 | void OColorPanelButton::enterEvent( QEvent* ) | 66 | void OColorPanelButton::enterEvent( QEvent* ) |
68 | { | 67 | { |
69 | if ( !m_active ) { | 68 | if ( !m_active ) { |
diff --git a/libqtaux/qcolordialog.cpp b/libqtaux/qcolordialog.cpp index b960b04..907c2aa 100644 --- a/libqtaux/qcolordialog.cpp +++ b/libqtaux/qcolordialog.cpp | |||
@@ -17,67 +17,65 @@ | |||
17 | ** GNU General Public License version 2 as published by the Free Software | 17 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 18 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 19 | ** packaging of this file. |
20 | ** | 20 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | 21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition |
22 | ** licenses may use this file in accordance with the Qt Commercial License | 22 | ** licenses may use this file in accordance with the Qt Commercial License |
23 | ** Agreement provided with the Software. | 23 | ** Agreement provided with the Software. |
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #include "qcolordialog.h" | 38 | #include "qcolordialog.h" |
39 | 39 | ||
40 | #include "qpainter.h" | 40 | #include "qpainter.h" |
41 | #include "qlayout.h" | 41 | #include "qlayout.h" |
42 | #include "qlabel.h" | 42 | #include "qlabel.h" |
43 | #include "qpushbutton.h" | 43 | #include "qpushbutton.h" |
44 | #include "qlineedit.h" | 44 | #include "qlineedit.h" |
45 | #include "qimage.h" | 45 | #include "qimage.h" |
46 | #include "qpixmap.h" | 46 | #include "qpixmap.h" |
47 | #include "qdrawutil.h" | 47 | #include "qdrawutil.h" |
48 | #include "qvalidator.h" | 48 | #include "qvalidator.h" |
49 | #include "qdragobject.h" | ||
50 | #include "qapplication.h" | 49 | #include "qapplication.h" |
51 | #include "qdragobject.h" | ||
52 | 50 | ||
53 | //////////// QWellArray BEGIN | 51 | //////////// QWellArray BEGIN |
54 | 52 | ||
55 | #include "qobjectdict.h" | 53 | #include "qobjectdict.h" |
56 | 54 | ||
57 | // | 55 | // |
58 | // W A R N I N G | 56 | // W A R N I N G |
59 | // ------------- | 57 | // ------------- |
60 | // | 58 | // |
61 | // This file is not part of the Qt API. It exists for the convenience | 59 | // This file is not part of the Qt API. It exists for the convenience |
62 | // of qwellarray.cpp and qcolordialog.cpp. | 60 | // of qwellarray.cpp and qcolordialog.cpp. |
63 | // This header file may change from version to version without notice, | 61 | // This header file may change from version to version without notice, |
64 | // or even be removed. | 62 | // or even be removed. |
65 | // | 63 | // |
66 | // | 64 | // |
67 | 65 | ||
68 | 66 | ||
69 | #include "qtableview.h" | 67 | #include "qtableview.h" |
70 | 68 | ||
71 | 69 | ||
72 | struct QWellArrayData; | 70 | struct QWellArrayData; |
73 | 71 | ||
74 | class QWellArray : public QTableView | 72 | class QWellArray : public QTableView |
75 | { | 73 | { |
76 | Q_OBJECT | 74 | Q_OBJECT |
77 | Q_PROPERTY( int numCols READ numCols ) | 75 | Q_PROPERTY( int numCols READ numCols ) |
78 | Q_PROPERTY( int numRows READ numRows ) | 76 | Q_PROPERTY( int numRows READ numRows ) |
79 | Q_PROPERTY( int selectedColumn READ selectedColumn ) | 77 | Q_PROPERTY( int selectedColumn READ selectedColumn ) |
80 | Q_PROPERTY( int selectedRow READ selectedRow ) | 78 | Q_PROPERTY( int selectedRow READ selectedRow ) |
81 | 79 | ||
82 | public: | 80 | public: |
83 | QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE ); | 81 | QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE ); |
diff --git a/libqtaux/qinputdialog.cpp b/libqtaux/qinputdialog.cpp index 821c74d..43e243f 100644 --- a/libqtaux/qinputdialog.cpp +++ b/libqtaux/qinputdialog.cpp | |||
@@ -10,65 +10,64 @@ | |||
10 | ** This file is part of the dialogs module of the Qt GUI Toolkit. | 10 | ** This file is part of the dialogs module of the Qt GUI Toolkit. |
11 | ** | 11 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 12 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 13 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 14 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 15 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 16 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 17 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 18 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 19 | ** packaging of this file. |
20 | ** | 20 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | 21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition |
22 | ** licenses may use this file in accordance with the Qt Commercial License | 22 | ** licenses may use this file in accordance with the Qt Commercial License |
23 | ** Agreement provided with the Software. | 23 | ** Agreement provided with the Software. |
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #include "qinputdialog.h" | 38 | #include "qinputdialog.h" |
39 | 39 | ||
40 | #include <qlayout.h> | 40 | #include <qlayout.h> |
41 | #include <qlabel.h> | 41 | #include <qlabel.h> |
42 | #include <qlineedit.h> | ||
43 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
44 | #include <qspinbox.h> | 43 | #include <qspinbox.h> |
45 | #include <qcombobox.h> | 44 | #include <qcombobox.h> |
46 | #include <qwidgetstack.h> | 45 | #include <qwidgetstack.h> |
47 | #include <qvalidator.h> | 46 | #include <qvalidator.h> |
48 | #include <qapplication.h> | 47 | #include <qapplication.h> |
49 | 48 | ||
50 | class QInputDialogPrivate | 49 | class QInputDialogPrivate |
51 | { | 50 | { |
52 | public: | 51 | public: |
53 | friend class QInputDialog; | 52 | friend class QInputDialog; |
54 | QLineEdit *lineEdit; | 53 | QLineEdit *lineEdit; |
55 | QSpinBox *spinBox; | 54 | QSpinBox *spinBox; |
56 | QComboBox *comboBox, *editComboBox; | 55 | QComboBox *comboBox, *editComboBox; |
57 | QPushButton *ok; | 56 | QPushButton *ok; |
58 | QWidgetStack *stack; | 57 | QWidgetStack *stack; |
59 | QInputDialog::Type type; | 58 | QInputDialog::Type type; |
60 | }; | 59 | }; |
61 | 60 | ||
62 | /*! | 61 | /*! |
63 | \class QInputDialog qinputdialog.h | 62 | \class QInputDialog qinputdialog.h |
64 | \brief A convenience dialog to get a simple input from the user | 63 | \brief A convenience dialog to get a simple input from the user |
65 | \ingroup dialogs | 64 | \ingroup dialogs |
66 | 65 | ||
67 | The QInputDialog is a simple dialog which can be used if you | 66 | The QInputDialog is a simple dialog which can be used if you |
68 | need a simple input from the user. This can be text, a number or | 67 | need a simple input from the user. This can be text, a number or |
69 | an item from a list. Also a label has to be set to tell the user | 68 | an item from a list. Also a label has to be set to tell the user |
70 | what he/she should input. | 69 | what he/she should input. |
71 | 70 | ||
72 | In this Qt version only the 4 static convenience functions | 71 | In this Qt version only the 4 static convenience functions |
73 | getText(), getInteger(), getDouble() and getItem() of QInputDialog | 72 | getText(), getInteger(), getDouble() and getItem() of QInputDialog |
74 | are available. | 73 | are available. |
diff --git a/libqtaux/qsplitter.cpp b/libqtaux/qsplitter.cpp index ab6e01b..39321f8 100644 --- a/libqtaux/qsplitter.cpp +++ b/libqtaux/qsplitter.cpp | |||
@@ -7,70 +7,66 @@ | |||
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. | 8 | ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. |
9 | ** | 9 | ** |
10 | ** This file is part of the widgets module of the Qt GUI Toolkit. | 10 | ** This file is part of the widgets module of the Qt GUI Toolkit. |
11 | ** | 11 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 12 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 13 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 14 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 15 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 16 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 17 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 18 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 19 | ** packaging of this file. |
20 | ** | 20 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | 21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition |
22 | ** licenses may use this file in accordance with the Qt Commercial License | 22 | ** licenses may use this file in accordance with the Qt Commercial License |
23 | ** Agreement provided with the Software. | 23 | ** Agreement provided with the Software. |
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | #include "qsplitter.h" | 37 | #include "qsplitter.h" |
38 | 38 | ||
39 | #include "qpainter.h" | ||
40 | #include "qdrawutil.h" | 39 | #include "qdrawutil.h" |
41 | #include "qbitmap.h" | ||
42 | #include "qlayoutengine_p.h" | 40 | #include "qlayoutengine_p.h" |
43 | #include "qlist.h" | ||
44 | #include "qarray.h" | ||
45 | #include "qobjectlist.h" | 41 | #include "qobjectlist.h" |
46 | #include "qapplication.h" //sendPostedEvents | 42 | #include "qapplication.h" //sendPostedEvents |
47 | 43 | ||
48 | class QSplitterHandle : public QWidget | 44 | class QSplitterHandle : public QWidget |
49 | { | 45 | { |
50 | public: | 46 | public: |
51 | QSplitterHandle( Qt::Orientation o, | 47 | QSplitterHandle( Qt::Orientation o, |
52 | QSplitter *parent, const char* name=0 ); | 48 | QSplitter *parent, const char* name=0 ); |
53 | void setOrientation( Qt::Orientation o ); | 49 | void setOrientation( Qt::Orientation o ); |
54 | Qt::Orientation orientation() const { return orient; } | 50 | Qt::Orientation orientation() const { return orient; } |
55 | 51 | ||
56 | bool opaque() const { return s->opaqueResize(); } | 52 | bool opaque() const { return s->opaqueResize(); } |
57 | 53 | ||
58 | QSize sizeHint() const; | 54 | QSize sizeHint() const; |
59 | QSizePolicy sizePolicy() const; | 55 | QSizePolicy sizePolicy() const; |
60 | 56 | ||
61 | int id() const { return myId; } // data->list.at(id())->wid == this | 57 | int id() const { return myId; } // data->list.at(id())->wid == this |
62 | void setId( int i ) { myId = i; } | 58 | void setId( int i ) { myId = i; } |
63 | 59 | ||
64 | protected: | 60 | protected: |
65 | void paintEvent( QPaintEvent * ); | 61 | void paintEvent( QPaintEvent * ); |
66 | void mouseMoveEvent( QMouseEvent * ); | 62 | void mouseMoveEvent( QMouseEvent * ); |
67 | void mousePressEvent( QMouseEvent * ); | 63 | void mousePressEvent( QMouseEvent * ); |
68 | void mouseReleaseEvent( QMouseEvent * ); | 64 | void mouseReleaseEvent( QMouseEvent * ); |
69 | 65 | ||
70 | private: | 66 | private: |
71 | Qt::Orientation orient; | 67 | Qt::Orientation orient; |
72 | bool opaq; | 68 | bool opaq; |
73 | int myId; | 69 | int myId; |
74 | 70 | ||
75 | QSplitter *s; | 71 | QSplitter *s; |
76 | }; | 72 | }; |