author | zecke <zecke> | 2004-03-14 20:15:38 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 20:15:38 (UTC) |
commit | 5064995ccd7a57edd2e41a2908b6402ff25995c4 (patch) (unidiff) | |
tree | 156685fc97a3fe2002b6f4250c7217b9c250f390 | |
parent | 0d79c003839718ae70b3b997162044abd5c26bf6 (diff) | |
download | opie-5064995ccd7a57edd2e41a2908b6402ff25995c4.zip opie-5064995ccd7a57edd2e41a2908b6402ff25995c4.tar.gz opie-5064995ccd7a57edd2e41a2908b6402ff25995c4.tar.bz2 |
More stuff cvs did not commit the first time
-rw-r--r-- | core/pim/today/config.in | 2 | ||||
-rw-r--r-- | core/pim/today/main.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/today.h | 1 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 5 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 1 | ||||
-rw-r--r-- | core/pim/today/todayconfig.h | 2 |
8 files changed, 8 insertions, 6 deletions
diff --git a/core/pim/today/config.in b/core/pim/today/config.in index cdebdcb..5166d15 100644 --- a/core/pim/today/config.in +++ b/core/pim/today/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY | 1 | config TODAY |
2 | boolean "opie-today (today gives an overview of appointments and todos)" | 2 | boolean "opie-today (today gives an overview of appointments and todos)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIEPIM2 |
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp index 974c050..d63bc30 100644 --- a/core/pim/today/main.cpp +++ b/core/pim/today/main.cpp | |||
@@ -1,24 +1,25 @@ | |||
1 | /* | 1 | /* |
2 | * main.cpp | 2 | * main.cpp |
3 | * | 3 | * |
4 | * --------------------- | 4 | * --------------------- |
5 | * | 5 | * |
6 | * begin : Sun 10 17:20:00 CEST 2002 | 6 | * begin : Sun 10 17:20:00 CEST 2002 |
7 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 7 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
8 | * email : max.reiss@gmx.de | 8 | * email : max.reiss@gmx.de |
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | /*************************************************************************** | 11 | /*************************************************************************** |
12 | * * | 12 | * * |
13 | * This program is free software; you can redistribute it and/or modify * | 13 | * This program is free software; you can redistribute it and/or modify * |
14 | * it under the terms of the GNU General Public License as published by * | 14 | * it under the terms of the GNU General Public License as published by * |
15 | * the Free Software Foundation; either version 2 of the License, or * | 15 | * the Free Software Foundation; either version 2 of the License, or * |
16 | * (at your option) any later version. * | 16 | * (at your option) any later version. * |
17 | * * | 17 | * * |
18 | ***************************************************************************/ | 18 | ***************************************************************************/ |
19 | 19 | ||
20 | #include "today.h" | 20 | #include "today.h" |
21 | 21 | ||
22 | #include <opie2/oapplicationfactory.h> | 22 | #include <opie2/oapplicationfactory.h> |
23 | 23 | ||
24 | using namespace Opie::Core; | ||
24 | OPIE_EXPORT_APP( OApplicationFactory<Today> ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<Today> ) |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 812f8b5..ebcd2dd 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -1,62 +1,63 @@ | |||
1 | /* | 1 | /* |
2 | * today.cpp | 2 | * today.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #define QTOPIA_INTERNAL_LANGLIST | 17 | #define QTOPIA_INTERNAL_LANGLIST |
18 | 18 | ||
19 | #include "today.h" | 19 | #include "today.h" |
20 | 20 | ||
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/contact.h> | 25 | #include <qpe/contact.h> |
26 | 26 | ||
27 | #include <qdir.h> | 27 | #include <qdir.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qwhatsthis.h> | 29 | #include <qwhatsthis.h> |
30 | 30 | ||
31 | using namespace Opie::Ui; | ||
31 | struct TodayPlugin { | 32 | struct TodayPlugin { |
32 | TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} | 33 | TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} |
33 | QLibrary *library; | 34 | QLibrary *library; |
34 | QInterfacePtr<TodayPluginInterface> iface; | 35 | QInterfacePtr<TodayPluginInterface> iface; |
35 | TodayPluginObject *guiPart; | 36 | TodayPluginObject *guiPart; |
36 | QWidget *guiBox; | 37 | QWidget *guiBox; |
37 | QString name; | 38 | QString name; |
38 | bool active; | 39 | bool active; |
39 | bool excludeRefresh; | 40 | bool excludeRefresh; |
40 | int pos; | 41 | int pos; |
41 | }; | 42 | }; |
42 | 43 | ||
43 | static QValueList<TodayPlugin> pluginList; | 44 | static QValueList<TodayPlugin> pluginList; |
44 | 45 | ||
45 | static QMap<QString, TodayPlugin> tempList; | 46 | static QMap<QString, TodayPlugin> tempList; |
46 | 47 | ||
47 | Today::Today( QWidget* parent, const char* name, WFlags fl ) | 48 | Today::Today( QWidget* parent, const char* name, WFlags fl ) |
48 | : TodayBase( parent, name, fl ) { | 49 | : TodayBase( parent, name, fl ) { |
49 | 50 | ||
50 | QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); | 51 | QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); |
51 | QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); | 52 | QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); |
52 | 53 | ||
53 | #if defined(Q_WS_QWS) | 54 | #if defined(Q_WS_QWS) |
54 | #if !defined(QT_NO_COP) | 55 | #if !defined(QT_NO_COP) |
55 | QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this ); | 56 | QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this ); |
56 | connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 57 | connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
57 | this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) ); | 58 | this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) ); |
58 | #endif | 59 | #endif |
59 | #endif | 60 | #endif |
60 | 61 | ||
61 | setOwnerField(); | 62 | setOwnerField(); |
62 | m_refreshTimer = new QTimer( this ); | 63 | m_refreshTimer = new QTimer( this ); |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 972731c..89170e1 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -1,63 +1,62 @@ | |||
1 | /* | 1 | /* |
2 | * today.h | 2 | * today.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | #ifndef TODAY_H | 16 | #ifndef TODAY_H |
17 | #define TODAY_H | 17 | #define TODAY_H |
18 | 18 | ||
19 | 19 | ||
20 | #include "todayconfig.h" | 20 | #include "todayconfig.h" |
21 | #include "todaybase.h" | 21 | #include "todaybase.h" |
22 | 22 | ||
23 | #include <opie2/todayplugininterface.h> | 23 | #include <opie2/todayplugininterface.h> |
24 | #include <opie2/oclickablelabel.h> | 24 | #include <opie2/oclickablelabel.h> |
25 | 25 | ||
26 | #include <qpe/qlibrary.h> | 26 | #include <qpe/qlibrary.h> |
27 | 27 | ||
28 | #include <qscrollview.h> | 28 | #include <qscrollview.h> |
29 | #include <qvbox.h> | 29 | #include <qvbox.h> |
30 | 30 | ||
31 | using namespace Opie; | ||
32 | 31 | ||
33 | class QVBoxLayout; | 32 | class QVBoxLayout; |
34 | 33 | ||
35 | class Today : public TodayBase { | 34 | class Today : public TodayBase { |
36 | 35 | ||
37 | Q_OBJECT | 36 | Q_OBJECT |
38 | 37 | ||
39 | public: | 38 | public: |
40 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 39 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
41 | ~Today(); | 40 | ~Today(); |
42 | static QString appName() { return QString::fromLatin1("today"); } | 41 | static QString appName() { return QString::fromLatin1("today"); } |
43 | 42 | ||
44 | private slots: | 43 | private slots: |
45 | void startConfig(); | 44 | void startConfig(); |
46 | void startApplication(); | 45 | void startApplication(); |
47 | void editCard(); | 46 | void editCard(); |
48 | void refresh(); | 47 | void refresh(); |
49 | 48 | ||
50 | private: | 49 | private: |
51 | void init(); | 50 | void init(); |
52 | void setOwnerField(); | 51 | void setOwnerField(); |
53 | void setOwnerField(QString &string); | 52 | void setOwnerField(QString &string); |
54 | void loadPlugins(); | 53 | void loadPlugins(); |
55 | void draw(); | 54 | void draw(); |
56 | void reinitialize(); | 55 | void reinitialize(); |
57 | 56 | ||
58 | void setRefreshTimer( int ); | 57 | void setRefreshTimer( int ); |
59 | 58 | ||
60 | private slots: | 59 | private slots: |
61 | void channelReceived(const QCString &msg, const QByteArray & data); | 60 | void channelReceived(const QCString &msg, const QByteArray & data); |
62 | 61 | ||
63 | private: | 62 | private: |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 7f1915c..cb809d3 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -1,55 +1,56 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.cpp | 2 | * todaybase.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "todaybase.h" | 17 | #include "todaybase.h" |
18 | 18 | ||
19 | #include <qpe/resource.h> | 19 | #include <qpe/resource.h> |
20 | 20 | ||
21 | #include <qvbox.h> | 21 | #include <qvbox.h> |
22 | #include <qwhatsthis.h> | 22 | #include <qwhatsthis.h> |
23 | 23 | ||
24 | using namespace Opie::Ui; | ||
24 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | 25 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) |
25 | : QWidget( parent, name, WStyle_ContextHelp ) { | 26 | : QWidget( parent, name, WStyle_ContextHelp ) { |
26 | 27 | ||
27 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 28 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo |
28 | QImage opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) ); | 29 | QImage opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) ); |
29 | opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); | 30 | opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); |
30 | QPixmap opiezilla; //the opiezilla | 31 | QPixmap opiezilla; //the opiezilla |
31 | opiezilla.convertFromImage( opiezillaimage ); | 32 | opiezilla.convertFromImage( opiezillaimage ); |
32 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon | 33 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon |
33 | 34 | ||
34 | layout = 0L; | 35 | layout = 0L; |
35 | 36 | ||
36 | QPalette pal = this->palette(); | 37 | QPalette pal = this->palette(); |
37 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); | 38 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); |
38 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); | 39 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); |
39 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); | 40 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); |
40 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); | 41 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); |
41 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 42 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |
42 | this->setPalette( pal ); | 43 | this->setPalette( pal ); |
43 | 44 | ||
44 | // --- logo Section --- | 45 | // --- logo Section --- |
45 | QPalette pal2; | 46 | QPalette pal2; |
46 | QColorGroup cg; | 47 | QColorGroup cg; |
47 | cg.setColor( QColorGroup::Text, white ); | 48 | cg.setColor( QColorGroup::Text, white ); |
48 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); | 49 | cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230 ), logo ) ); |
49 | pal2.setActive( cg ); | 50 | pal2.setActive( cg ); |
50 | 51 | ||
51 | // today logo | 52 | // today logo |
52 | Frame = new QLabel( this, "Frame" ); | 53 | Frame = new QLabel( this, "Frame" ); |
53 | Frame->setPalette( pal2 ); | 54 | Frame->setPalette( pal2 ); |
54 | Frame->setFrameShape( QFrame::StyledPanel ); | 55 | Frame->setFrameShape( QFrame::StyledPanel ); |
55 | Frame->setFrameShadow( QFrame::Raised ); | 56 | Frame->setFrameShadow( QFrame::Raised ); |
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index b737351..6ee9bb2 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -1,56 +1,55 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.h | 2 | * todaybase.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef TODAYBASE_H | 17 | #ifndef TODAYBASE_H |
18 | #define TODAYBASE_H | 18 | #define TODAYBASE_H |
19 | 19 | ||
20 | #include <opie2/oclickablelabel.h> | 20 | #include <opie2/oclickablelabel.h> |
21 | 21 | ||
22 | #include <qlayout.h> | 22 | #include <qlayout.h> |
23 | 23 | ||
24 | class QVBox; | 24 | class QVBox; |
25 | class QGridLayout; | 25 | class QGridLayout; |
26 | class QFrame; | 26 | class QFrame; |
27 | class QLabel; | 27 | class QLabel; |
28 | class QPushButton; | 28 | class QPushButton; |
29 | class QBoxLayout; | 29 | class QBoxLayout; |
30 | 30 | ||
31 | 31 | ||
32 | using namespace Opie; | ||
33 | 32 | ||
34 | 33 | ||
35 | class TodayBase : public QWidget | 34 | class TodayBase : public QWidget |
36 | { | 35 | { |
37 | Q_OBJECT | 36 | Q_OBJECT |
38 | 37 | ||
39 | public: | 38 | public: |
40 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); | 39 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); |
41 | ~TodayBase(); | 40 | ~TodayBase(); |
42 | 41 | ||
43 | QFrame* Frame4; | 42 | QFrame* Frame4; |
44 | QPushButton* DatesButton; | 43 | QPushButton* DatesButton; |
45 | QVBoxLayout* layout; | 44 | QVBoxLayout* layout; |
46 | Opie::OClickableLabel* OwnerField; | 45 | Opie::Ui::OClickableLabel* OwnerField; |
47 | QLabel* Frame; | 46 | QLabel* Frame; |
48 | QLabel* DateLabel; | 47 | QLabel* DateLabel; |
49 | QFrame* Frame15; | 48 | QFrame* Frame15; |
50 | QLabel* Opiezilla; | 49 | QLabel* Opiezilla; |
51 | QLabel* TodayLabel; | 50 | QLabel* TodayLabel; |
52 | OClickableLabel* ConfigButton; | 51 | Opie::Ui::OClickableLabel* ConfigButton; |
53 | 52 | ||
54 | }; | 53 | }; |
55 | 54 | ||
56 | #endif | 55 | #endif |
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index a6f53e1..4f0877c 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -1,64 +1,65 @@ | |||
1 | /* | 1 | /* |
2 | * todayconfig.cpp | 2 | * todayconfig.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "todayconfig.h" | 17 | #include "todayconfig.h" |
18 | 18 | ||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 21 | #include <qpe/qcopenvelope_qws.h> |
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | 23 | ||
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
25 | #include <qlabel.h> | 25 | #include <qlabel.h> |
26 | #include <qspinbox.h> | 26 | #include <qspinbox.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qheader.h> | 28 | #include <qheader.h> |
29 | #include <qvbox.h> | 29 | #include <qvbox.h> |
30 | #include <qtoolbutton.h> | 30 | #include <qtoolbutton.h> |
31 | #include <qwhatsthis.h> | 31 | #include <qwhatsthis.h> |
32 | 32 | ||
33 | using namespace Opie::Ui; | ||
33 | class ToolButton : public QToolButton { | 34 | class ToolButton : public QToolButton { |
34 | 35 | ||
35 | public: | 36 | public: |
36 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 37 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
37 | : QToolButton( parent, name ) { | 38 | : QToolButton( parent, name ) { |
38 | setPixmap( Resource::loadPixmap( icon ) ); | 39 | setPixmap( Resource::loadPixmap( icon ) ); |
39 | setAutoRaise( TRUE ); | 40 | setAutoRaise( TRUE ); |
40 | setFocusPolicy( QWidget::NoFocus ); | 41 | setFocusPolicy( QWidget::NoFocus ); |
41 | setToggleButton( t ); | 42 | setToggleButton( t ); |
42 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); | 43 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); |
43 | } | 44 | } |
44 | }; | 45 | }; |
45 | 46 | ||
46 | 47 | ||
47 | /** | 48 | /** |
48 | * The class has currently quite some duplicate code. | 49 | * The class has currently quite some duplicate code. |
49 | * By that way it would be real easy to have it as seperate app in settings tab | 50 | * By that way it would be real easy to have it as seperate app in settings tab |
50 | * | 51 | * |
51 | */ | 52 | */ |
52 | TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) | 53 | TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) |
53 | : QDialog( parent, name, modal, WStyle_ContextHelp ) { | 54 | : QDialog( parent, name, modal, WStyle_ContextHelp ) { |
54 | 55 | ||
55 | setCaption( tr( "Today Config" ) ); | 56 | setCaption( tr( "Today Config" ) ); |
56 | 57 | ||
57 | QVBoxLayout *layout = new QVBoxLayout( this ); | 58 | QVBoxLayout *layout = new QVBoxLayout( this ); |
58 | TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 59 | TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
59 | layout->addWidget( TabWidget3 ); | 60 | layout->addWidget( TabWidget3 ); |
60 | 61 | ||
61 | tab_2 = new QWidget( TabWidget3, "tab_2" ); | 62 | tab_2 = new QWidget( TabWidget3, "tab_2" ); |
62 | QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 ); | 63 | QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 ); |
63 | QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 ); | 64 | QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 ); |
64 | tab2Layout->addWidget( l ); | 65 | tab2Layout->addWidget( l ); |
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 3b585c9..2b6c507 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h | |||
@@ -9,65 +9,65 @@ | |||
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef TODAYCONFIG_H | 17 | #ifndef TODAYCONFIG_H |
18 | #define TODAYCONFIG_H | 18 | #define TODAYCONFIG_H |
19 | 19 | ||
20 | #include "todayconfigmiscbase.h" | 20 | #include "todayconfigmiscbase.h" |
21 | 21 | ||
22 | #include <opie2/otabwidget.h> | 22 | #include <opie2/otabwidget.h> |
23 | 23 | ||
24 | #include <qvariant.h> | 24 | #include <qvariant.h> |
25 | #include <qdialog.h> | 25 | #include <qdialog.h> |
26 | #include <qlistview.h> | 26 | #include <qlistview.h> |
27 | 27 | ||
28 | class QCheckBox; | 28 | class QCheckBox; |
29 | class QLabel; | 29 | class QLabel; |
30 | class QSpinBox; | 30 | class QSpinBox; |
31 | class QTabWidget; | 31 | class QTabWidget; |
32 | 32 | ||
33 | class TodayConfig : public QDialog { | 33 | class TodayConfig : public QDialog { |
34 | 34 | ||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | 36 | ||
37 | public: | 37 | public: |
38 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); | 38 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); |
39 | ~TodayConfig(); | 39 | ~TodayConfig(); |
40 | 40 | ||
41 | OTabWidget* TabWidget3; | 41 | Opie::Ui::OTabWidget* TabWidget3; |
42 | 42 | ||
43 | void writeConfig(); | 43 | void writeConfig(); |
44 | void pluginManagement( QString libName, QString name, QPixmap icon ); | 44 | void pluginManagement( QString libName, QString name, QPixmap icon ); |
45 | 45 | ||
46 | 46 | ||
47 | protected slots: | 47 | protected slots: |
48 | void appletChanged(); | 48 | void appletChanged(); |
49 | void moveSelectedUp(); | 49 | void moveSelectedUp(); |
50 | void moveSelectedDown(); | 50 | void moveSelectedDown(); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | void setAutoStart(); | 53 | void setAutoStart(); |
54 | void readConfig(); | 54 | void readConfig(); |
55 | 55 | ||
56 | QListView* m_appletListView; | 56 | QListView* m_appletListView; |
57 | QMap<QString,QCheckListItem*> m_applets; | 57 | QMap<QString,QCheckListItem*> m_applets; |
58 | 58 | ||
59 | int m_autoStart; | 59 | int m_autoStart; |
60 | int m_autoStartTimer; | 60 | int m_autoStartTimer; |
61 | int m_iconSize; | 61 | int m_iconSize; |
62 | QStringList m_excludeApplets; | 62 | QStringList m_excludeApplets; |
63 | bool m_applets_changed; | 63 | bool m_applets_changed; |
64 | 64 | ||
65 | QWidget* tab_2; | 65 | QWidget* tab_2; |
66 | QWidget* tab_3; | 66 | QWidget* tab_3; |
67 | QLabel* TextLabel1, *TextLabel4; | 67 | QLabel* TextLabel1, *TextLabel4; |
68 | QSpinBox* SpinBox7; | 68 | QSpinBox* SpinBox7; |
69 | 69 | ||
70 | TodayConfigMiscBase *m_guiMisc; | 70 | TodayConfigMiscBase *m_guiMisc; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | #endif | 73 | #endif |