summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp16
-rw-r--r--core/pim/today/today.h1
2 files changed, 2 insertions, 15 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 1b31cfd..e6f8c93 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -176,30 +176,28 @@ void Today::loadPlugins() {
QLibrary *lib = new QLibrary( path + "/" + *it );
qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
qDebug( "loading: %s", QString( path + "/" + *it ).latin1() );
qDebug( QString(*it) );
// If plugin is exludes from refresh, get it in the list again here.
if ( pluginListRefreshExclude.contains( (*it) ) ) {
// if its not in allApplets list, add it to a layout
if ( !m_allApplets.contains( pluginListRefreshExclude[(*it)].name ) ) {
- qDebug( "NUGASDA" );
layout->addWidget( pluginListRefreshExclude[(*it)].guiBox );
pluginList.append( pluginListRefreshExclude[(*it)] );
} else {
tempList.insert( pluginListRefreshExclude[(*it)].name, pluginListRefreshExclude[(*it)] );
- qDebug( "TEST2 " + pluginListRefreshExclude[(*it)].name );
}
} else {
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 {
@@ -346,55 +344,45 @@ void Today::startConfig() {
connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
}
}
/**
* Refresh for the view. Reload all applets
*
*/
void Today::refresh() {
init();
- qDebug(" refresh ");
+ // qDebug(" refresh ");
// set the date in top label
QDate date = QDate::currentDate();
QString time = ( tr( date.toString() ) );
DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
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" );
-}
-
-
void Today::startApplication() {
QCopEnvelope e( "QPE/System", "execute(QString)" );
e << QString( sender()->name() );
}
/**
* launch addressbook (personal card)
*/
void Today::editCard() {
- startAddressbook();
- while( !QCopChannel::isRegistered( "QPE/Addressbook" ) ) {
- qApp->processEvents();
- }
- QCopEnvelope v( "QPE/Addressbook", "editPersonalAndClose()" );
+ QCopEnvelope env( "QPE/Application/addressbook", "editPersonalAndClose()" );
}
Today::~Today() {
}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 4485a0b..35b7ee3 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -36,25 +36,24 @@ class OClickableLabel;
class Today : public TodayBase {
Q_OBJECT
public:
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
private slots:
void startConfig();
- void startAddressbook();
void startApplication();
void editCard();
void refresh();
private:
void init();
void setOwnerField();
void setOwnerField(QString &string);
void loadPlugins();
void draw();
void setRefreshTimer( int );