| -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 @@ config TODAY boolean "opie-today (today gives an overview of appointments and todos)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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 @@ /* * main.cpp * * --------------------- * * begin : Sun 10 17:20:00 CEST 2002 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : max.reiss@gmx.de * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "today.h" #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; 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 @@ -7,48 +7,49 @@ */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #define QTOPIA_INTERNAL_LANGLIST #include "today.h" #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/resource.h> #include <qpe/qpeapplication.h> #include <qpe/contact.h> #include <qdir.h> #include <qtimer.h> #include <qwhatsthis.h> +using namespace Opie::Ui; struct TodayPlugin { TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} QLibrary *library; QInterfacePtr<TodayPluginInterface> iface; TodayPluginObject *guiPart; QWidget *guiBox; QString name; bool active; bool excludeRefresh; int pos; }; static QValueList<TodayPlugin> pluginList; static QMap<QString, TodayPlugin> tempList; Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ) { QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); #if defined(Q_WS_QWS) #if !defined(QT_NO_COP) 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 @@ -7,49 +7,48 @@ */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef TODAY_H #define TODAY_H #include "todayconfig.h" #include "todaybase.h" #include <opie2/todayplugininterface.h> #include <opie2/oclickablelabel.h> #include <qpe/qlibrary.h> #include <qscrollview.h> #include <qvbox.h> -using namespace Opie; class QVBoxLayout; class Today : public TodayBase { Q_OBJECT public: Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Today(); static QString appName() { return QString::fromLatin1("today"); } private slots: void startConfig(); void startApplication(); void editCard(); void refresh(); private: void init(); void setOwnerField(); void setOwnerField(QString &string); void loadPlugins(); void draw(); 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,47 +1,48 @@ /* * todaybase.cpp * * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "todaybase.h" #include <qpe/resource.h> #include <qvbox.h> #include <qwhatsthis.h> +using namespace Opie::Ui; TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) : QWidget( parent, name, WStyle_ContextHelp ) { QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo QImage opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) ); opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); QPixmap opiezilla; //the opiezilla opiezilla.convertFromImage( opiezillaimage ); QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon layout = 0L; QPalette pal = this->palette(); QColor col = pal.color( QPalette::Active, QColorGroup::Background ); pal.setColor( QPalette::Active, QColorGroup::Button, col ); pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); pal.setColor( QPalette::Normal, QColorGroup::Button, col ); pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); this->setPalette( pal ); // --- logo Section --- QPalette pal2; QColorGroup cg; cg.setColor( QColorGroup::Text, white ); 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 @@ -8,49 +8,48 @@ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef TODAYBASE_H #define TODAYBASE_H #include <opie2/oclickablelabel.h> #include <qlayout.h> class QVBox; class QGridLayout; class QFrame; class QLabel; class QPushButton; class QBoxLayout; -using namespace Opie; class TodayBase : public QWidget { Q_OBJECT public: TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); ~TodayBase(); QFrame* Frame4; QPushButton* DatesButton; QVBoxLayout* layout; - Opie::OClickableLabel* OwnerField; + Opie::Ui::OClickableLabel* OwnerField; QLabel* Frame; QLabel* DateLabel; QFrame* Frame15; QLabel* Opiezilla; QLabel* TodayLabel; - OClickableLabel* ConfigButton; + Opie::Ui::OClickableLabel* ConfigButton; }; #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 @@ -9,48 +9,49 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "todayconfig.h" #include <qpe/config.h> #include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> #include <qcheckbox.h> #include <qlabel.h> #include <qspinbox.h> #include <qlayout.h> #include <qheader.h> #include <qvbox.h> #include <qtoolbutton.h> #include <qwhatsthis.h> +using namespace Opie::Ui; class ToolButton : public QToolButton { public: ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) : QToolButton( parent, name ) { setPixmap( Resource::loadPixmap( icon ) ); setAutoRaise( TRUE ); setFocusPolicy( QWidget::NoFocus ); setToggleButton( t ); connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); } }; /** * The class has currently quite some duplicate code. * By that way it would be real easy to have it as seperate app in settings tab * */ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal ) : QDialog( parent, name, modal, WStyle_ContextHelp ) { setCaption( tr( "Today Config" ) ); 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 @@ -17,49 +17,49 @@ #ifndef TODAYCONFIG_H #define TODAYCONFIG_H #include "todayconfigmiscbase.h" #include <opie2/otabwidget.h> #include <qvariant.h> #include <qdialog.h> #include <qlistview.h> class QCheckBox; class QLabel; class QSpinBox; class QTabWidget; class TodayConfig : public QDialog { Q_OBJECT public: TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); ~TodayConfig(); - OTabWidget* TabWidget3; + Opie::Ui::OTabWidget* TabWidget3; void writeConfig(); void pluginManagement( QString libName, QString name, QPixmap icon ); protected slots: void appletChanged(); void moveSelectedUp(); void moveSelectedDown(); private: void setAutoStart(); void readConfig(); QListView* m_appletListView; QMap<QString,QCheckListItem*> m_applets; int m_autoStart; int m_autoStartTimer; int m_iconSize; QStringList m_excludeApplets; bool m_applets_changed; QWidget* tab_2; |