summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-05 21:30:19 (UTC)
committer zautrix <zautrix>2005-01-05 21:30:19 (UTC)
commited3b1be69915eaff3bfad542fd50bb18624c323e (patch) (side-by-side diff)
tree2c721bafdd75113c2b92d305ad4cf4199a6cef07
parent9bbe06c6cbf70ab8741acc6b356890c072b103e8 (diff)
downloadkdepimpi-ed3b1be69915eaff3bfad542fd50bb18624c323e.zip
kdepimpi-ed3b1be69915eaff3bfad542fd50bb18624c323e.tar.gz
kdepimpi-ed3b1be69915eaff3bfad542fd50bb18624c323e.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--kalarmd/simplealarmdaemonapplet.cpp6
2 files changed, 3 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index df0b2eb..6a9a200 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,31 +1,31 @@
Info about the changes in new versions of KDE-Pim/Pi
********** VERSION 1.9.16 ************
KO/Pi:
Fixed search dialog size on Z 6000 (480x640 display).
Added setting to hide/show time in agenda items.
Added setting to hide not running todos in todo view.
Added columns for start date/time in todo view.
Replaced the solid half-hour lines in agenda view by dot lines.
Fixed some minor problems. (Like word wrap in help text windows).
Fixed a strange problem in KO/Pi alarm applet.
Did not find the actual problem,
-such that now Qtopia reboots if deinstalling the alarm applet.
+such that now Qtopia reboots again if deinstalling the alarm applet.
But the alarm applet should work again.
********** VERSION 1.9.15 ************
Usebilty enhancements in KO/Pi:
When clicking on the date in a month view cell, the day view is shown.
Old behaviour was, that the "new event" dialog popped up.
Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu).
That means, you can restore the latest
event/todo/journal you have deleted.
A journal is deleted, if you clear all the text of the journal.
Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 3277036..73b1e07 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -1,60 +1,58 @@
#include "simplealarmdaemonapplet.h"
#include "simplealarmdaemonimpl.h"
#include <qcopchannel_qws.h>
#include <qlabel.h>
#include <qapp.h>
#include <qpe/resource.h>
SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
: mApplet( 0 ), ref( 0 )
{
}
SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
{
- //delete mApplet;
+ delete mApplet;
mApplet = 0;
}
QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent )
{
if ( !mApplet ) {
mApplet = new SimpleAlarmDaemonImpl( parent );
if ( QApplication::desktop()->width() < 480 )
mApplet->setPixmap( Resource::loadPixmap( "ko16" ) );
else
mApplet->setPixmap( Resource::loadPixmap( "ko24" ) );
QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ;
QObject::connect( c, SIGNAL (received ( const QCString &, const QByteArray & )),mApplet, SLOT(recieve( const QCString&, const QByteArray& )));
mApplet->show();
}
return mApplet;
}
int SimpleAlarmDaemonApplet::position() const
{
return 7;
}
QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
- // qDebug(" SimpleAlarmDaemonApplet::queryInterface ");
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_TaskbarApplet )
*iface = this;
-
if ( *iface ) {
(*iface)->addRef();
return QS_OK;
}
- return QE_NOINTERFACE;
+ return QS_FALSE;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( SimpleAlarmDaemonApplet )
}