summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp4
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.cpp6
-rw-r--r--core/pim/today/today.cpp58
-rw-r--r--core/pim/today/today.h9
-rw-r--r--core/pim/today/todaybase.cpp16
-rw-r--r--core/pim/today/todayconfig.cpp4
6 files changed, 40 insertions, 57 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 1caf061..d4e8e1e 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -27,12 +27,14 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
// int onlyLater,
int maxCharClip,
const char* name,
WFlags fl) :
OClickableLabel(parent,name,fl), event(ev) {
+ setAlignment( AlignTop );
+
QString msg;
Config config( "qpe" );
config.setGroup( "Time" );
// if 24 h format
ampm = config.readBoolEntry( "AMPM", TRUE );
@@ -87,14 +89,12 @@ QString DateBookEvent::ampmTime( QTime tm ) {
return s;
}
}
-//extern QPEApplication *todayApp;
-
/*
* starts the edit dialog as known from datebook
*/
void DateBookEvent::editEventSlot( const Event &e ) {
startDatebook();
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index e4667ae..7948656 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -56,12 +56,14 @@ void DatebookPluginWidget::readConfig() {
void DatebookPluginWidget::getDates() {
QDate date = QDate::currentDate();
QVBoxLayout* layoutDates = new QVBoxLayout( this );
+ layoutDates->setSpacing( 1 );
+ layoutDates->setMargin( 1 );
if ( db ) {
delete db;
}
db = new DateBookDB;
@@ -102,13 +104,13 @@ void DatebookPluginWidget::getDates() {
}
} else {
QLabel* noEvents = new QLabel( this );
noEvents->setText( QObject::tr( "No appointments today" ) );
layoutDates->addWidget( noEvents );
}
-
- layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+ //layoutDates->addStretch(0);
+// layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
// how often refresh - later have qcop update calls in *db
//QTimer::singleShot( 20*1000, this , SLOT( getDates() ) );
}
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index f052a9f..7537631 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -61,15 +61,13 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
connect ( todayChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
#endif
#endif
setOwnerField();
- init();
- loadPlugins();
- draw();
+ refresh();
showMaximized();
}
/**
* Qcop receive method.
*/
@@ -115,13 +113,12 @@ void Today::init() {
QString time = ( tr( date.toString() ) );
DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
// read config
Config cfg( "today" );
-
cfg.setGroup( "Applets" );
m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
}
/**
@@ -133,19 +130,19 @@ void Today::loadPlugins() {
for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
(*tit).library->unload();
delete (*tit).library;
}
pluginList.clear();
+
QString path = QPEApplication::qpeDir() + "/plugins/today";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
QStringList::Iterator it;
- uint count = 0;
for ( it = list.begin(); it != list.end(); ++it ) {
TodayPluginInterface *iface = 0;
QLibrary *lib = new QLibrary( path + "/" + *it );
qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
@@ -153,12 +150,13 @@ void Today::loadPlugins() {
qDebug( QString(*it) );
TodayPlugin plugin;
plugin.library = lib;
plugin.iface = iface;
plugin.name = QString(*it);
+ // find out if plugins should be shown
if ( m_excludeApplets.grep( *it ).isEmpty() ) {
plugin.active = true;
} else {
plugin.active = false;
}
plugin.guiPart = plugin.iface->guiPart();
@@ -173,13 +171,12 @@ void Today::loadPlugins() {
plugIcon->setPixmap( plugPix );
// a scrollview for each plugin
QScrollView* sv = new QScrollView( plugin.guiBox );
QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() );
sv->setMinimumHeight( plugin.guiPart->minHeight() );
- //sv->setMaximumHeight( plugin.guiPart->maxHeight() );
sv->setResizePolicy( QScrollView::AutoOneFit );
sv->setHScrollBarMode( QScrollView::AlwaysOff );
sv->setFrameShape( QFrame::NoFrame );
sv->addChild( plugWidget );
// make sure the icon is on the top alligned
@@ -187,13 +184,12 @@ void Today::loadPlugins() {
boxLayout->addWidget( sv, 0, AlignTop );
boxLayout->setStretchFactor( plugIcon, 1 );
boxLayout->setStretchFactor( sv, 9 );
layout->addWidget( plugin.guiBox );
pluginList.append( plugin );
- count++;
} else {
qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() );
delete lib;
}
}
}
@@ -228,26 +224,25 @@ void Today::draw() {
if ( count == 0 ) {
QLabel *noPluginsActive = new QLabel( this );
noPluginsActive->setText( tr( "No plugins activated" ) );
layout->addWidget( noPluginsActive );
}
-
- layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
+ //layout->addStretch(0);
+ //layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
}
/**
* The method for the configuration dialog.
*/
void Today::startConfig() {
TodayConfig conf( this, "dialog", true );
TodayPlugin plugin;
-
QList<ConfigWidget> configWidgetList;
for ( uint i = 0; i < pluginList.count(); i++ ) {
plugin = pluginList[i];
// load the config widgets in the tabs
if ( plugin.guiPart->configWidget( this ) != 0l ) {
@@ -264,35 +259,34 @@ void Today::startConfig() {
conf.writeConfig();
ConfigWidget *confWidget;
for ( confWidget = configWidgetList.first(); confWidget != 0;
confWidget = configWidgetList.next() ) {
confWidget->writeConfig();
}
+ refresh();
+ }
+}
- init();
-
- TodayPlugin plugin;
- QValueList<TodayPlugin> plugList;
- for ( uint i = 0; i < pluginList.count(); i++ ) {
- plugin = pluginList[i];
- if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) {
- qDebug("CONFIG " + plugin.name + " ACTIVE");
- plugin.active = true;
- } else {
- qDebug("CONFIG " + plugin.name + " INACTIVE");
- plugin.active = false;
- }
- plugList.append( plugin );
- }
- pluginList = plugList;
+/**
+ * Refresh for the view. Reload all applets
+ *
+ */
+void Today::refresh() {
+ init();
- draw();
+ if ( layout ) {
+ delete layout;
}
-}
+ layout = new QVBoxLayout( this );
+ layout->addWidget( Frame );
+ layout->addWidget( OwnerField );
+ loadPlugins();
+ draw();
+}
void Today::startAddressbook() {
QCopEnvelope e( "QPE/System", "execute(QString)" );
e << QString( "addressbook" );
}
@@ -305,17 +299,9 @@ void Today::editCard() {
while( !QCopChannel::isRegistered( "QPE/Addressbook" ) ) {
qApp->processEvents();
}
QCopEnvelope v( "QPE/Addressbook", "editPersonalAndClose()" );
}
-/*
- * launches an App
- */
-void Today::launchApp( QString appName ) {
- QCopEnvelope e( "QPE/System", "execute(QString)" );
- e << QString( appName );
-}
-
Today::~Today() {
}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 0a9a705..672adc4 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -39,34 +39,33 @@ class Today : public TodayBase {
Q_OBJECT
public:
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
- private slots:
+private slots:
void startConfig();
void startAddressbook();
- void launchApp( QString appName );
void editCard();
- void draw();
+ void refresh();
private:
void init();
void setOwnerField();
void setOwnerField(QString &string);
void loadPlugins();
+ void draw();
+
private slots:
void channelReceived(const QCString &msg, const QByteArray & data);
private:
TodayConfig *conf;
QStringList m_excludeApplets;
- QVBoxLayout *pluginLayout;
-
// QString m_autoStartTimer;
int m_newStart;
// int m_autoStart;
int m_maxCharClip;
};
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 74f4fa0..800ca5d 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -31,12 +31,14 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
QPixmap config = Resource::loadPixmap( "today/config" ); // config icon
layout = new QVBoxLayout( this );
+ QVBoxLayout *mainLayout = new QVBoxLayout( this );
+
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 );
@@ -74,32 +76,28 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
DateLabel_font.setBold( TRUE );
DateLabel->setFont( DateLabel_font );
DateLabel->setBackgroundOrigin( QLabel::ParentOrigin );
DateLabel->setTextFormat( RichText );
// Opiezilla
- QLabel* Opiezilla = new QLabel( Frame, "OpieZilla");
+ QLabel* Opiezilla = new QLabel( Frame, "OpieZilla" );
Opiezilla->setPixmap( opiezilla );
- Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47);
+ Opiezilla->setGeometry( QApplication::desktop()->width()-50 ,1, 45, 47 );
Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
// Ownerfield
OwnerField = new OClickableLabel( this , "Owner" );
- OwnerField->setGeometry( QRect( 0,0, this->width(), 12 ));
+ OwnerField->setGeometry( QRect( 0, 0, this->width(), 12 ) );
OwnerField->setAlignment( int (QLabel::AlignTop | QLabel::AlignLeft ) );
OwnerField->setMaximumHeight(12);
// config
ConfigButton = new OClickableLabel ( Frame, "PushButton1" );
- ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) );
- ConfigButton->setPixmap( config );
+ ConfigButton->setGeometry( QRect( QApplication::desktop()->width()-80, 30, 25, 21 ) );
+ ConfigButton->setPixmap( config );
ConfigButton->setBackgroundOrigin( QLabel::ParentOrigin );
-
- // -- layout --
- layout->addWidget( Frame );
- layout->addWidget( OwnerField );
}
/**
* D' tor
*/
TodayBase::~TodayBase() {
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 79c4d1f..4f23471 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -54,14 +54,12 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
: QDialog( parent, name, modal, fl ) {
setCaption( tr( "Today config" ) );
QVBoxLayout *layout = new QVBoxLayout( this );
TabWidget3 = new QTabWidget( this, "TabWidget3" );
- // TabWidget3->setFrameShape( QFrame::NoFrame );
- //TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) );
TabWidget3->setAutoMask( FALSE );
TabWidget3->setTabShape( QTabWidget::Rounded );
layout->addWidget( TabWidget3 );
tab_2 = new QWidget( TabWidget3, "tab_2" );
QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
@@ -119,13 +117,13 @@ void TodayConfig::setAutoStart() {
QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
e << QString( "add" );
e << QString( "today" );
e << m_autoStartTimer;
} else {
QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
- e << QString( "remove");
+ e << QString( "remove" );
e << QString( "today" );
}
}
/**
* Read the config part