summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-05 21:30:19 (UTC)
committer zautrix <zautrix>2005-01-05 21:30:19 (UTC)
commited3b1be69915eaff3bfad542fd50bb18624c323e (patch) (unidiff)
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 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 1.9.16 ************ 3********** VERSION 1.9.16 ************
4 4
5KO/Pi: 5KO/Pi:
6Fixed search dialog size on Z 6000 (480x640 display). 6Fixed search dialog size on Z 6000 (480x640 display).
7Added setting to hide/show time in agenda items. 7Added setting to hide/show time in agenda items.
8Added setting to hide not running todos in todo view. 8Added setting to hide not running todos in todo view.
9Added columns for start date/time in todo view. 9Added columns for start date/time in todo view.
10Replaced the solid half-hour lines in agenda view by dot lines. 10Replaced the solid half-hour lines in agenda view by dot lines.
11Fixed some minor problems. (Like word wrap in help text windows). 11Fixed some minor problems. (Like word wrap in help text windows).
12 12
13Fixed a strange problem in KO/Pi alarm applet. 13Fixed a strange problem in KO/Pi alarm applet.
14Did not find the actual problem, 14Did not find the actual problem,
15such that now Qtopia reboots if deinstalling the alarm applet. 15such that now Qtopia reboots again if deinstalling the alarm applet.
16But the alarm applet should work again. 16But the alarm applet should work again.
17 17
18 18
19********** VERSION 1.9.15 ************ 19********** VERSION 1.9.15 ************
20 20
21Usebilty enhancements in KO/Pi: 21Usebilty enhancements in KO/Pi:
22When clicking on the date in a month view cell, the day view is shown. 22When clicking on the date in a month view cell, the day view is shown.
23Old behaviour was, that the "new event" dialog popped up. 23Old behaviour was, that the "new event" dialog popped up.
24 24
25Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 25Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu).
26That means, you can restore the latest 26That means, you can restore the latest
27event/todo/journal you have deleted. 27event/todo/journal you have deleted.
28A journal is deleted, if you clear all the text of the journal. 28A journal is deleted, if you clear all the text of the journal.
29 29
30Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14. 30Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
31 31
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 @@
1#include "simplealarmdaemonapplet.h" 1#include "simplealarmdaemonapplet.h"
2 2
3#include "simplealarmdaemonimpl.h" 3#include "simplealarmdaemonimpl.h"
4 4
5#include <qcopchannel_qws.h> 5#include <qcopchannel_qws.h>
6#include <qlabel.h> 6#include <qlabel.h>
7#include <qapp.h> 7#include <qapp.h>
8#include <qpe/resource.h> 8#include <qpe/resource.h>
9SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet() 9SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
10 : mApplet( 0 ), ref( 0 ) 10 : mApplet( 0 ), ref( 0 )
11{ 11{
12 12
13} 13}
14 14
15SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet() 15SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
16{ 16{
17 //delete mApplet; 17 delete mApplet;
18 mApplet = 0; 18 mApplet = 0;
19} 19}
20 20
21 21
22QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent ) 22QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent )
23{ 23{
24 if ( !mApplet ) { 24 if ( !mApplet ) {
25 mApplet = new SimpleAlarmDaemonImpl( parent ); 25 mApplet = new SimpleAlarmDaemonImpl( parent );
26 if ( QApplication::desktop()->width() < 480 ) 26 if ( QApplication::desktop()->width() < 480 )
27 mApplet->setPixmap( Resource::loadPixmap( "ko16" ) ); 27 mApplet->setPixmap( Resource::loadPixmap( "ko16" ) );
28 else 28 else
29 mApplet->setPixmap( Resource::loadPixmap( "ko24" ) ); 29 mApplet->setPixmap( Resource::loadPixmap( "ko24" ) );
30 QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ; 30 QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ;
31 QObject::connect( c, SIGNAL (received ( const QCString &, const QByteArray & )),mApplet, SLOT(recieve( const QCString&, const QByteArray& ))); 31 QObject::connect( c, SIGNAL (received ( const QCString &, const QByteArray & )),mApplet, SLOT(recieve( const QCString&, const QByteArray& )));
32 mApplet->show(); 32 mApplet->show();
33 } 33 }
34 return mApplet; 34 return mApplet;
35} 35}
36 36
37int SimpleAlarmDaemonApplet::position() const 37int SimpleAlarmDaemonApplet::position() const
38{ 38{
39 return 7; 39 return 7;
40} 40}
41 41
42QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 42QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
43{ 43{
44 // qDebug(" SimpleAlarmDaemonApplet::queryInterface ");
45 *iface = 0; 44 *iface = 0;
46 if ( uuid == IID_QUnknown ) 45 if ( uuid == IID_QUnknown )
47 *iface = this; 46 *iface = this;
48 else if ( uuid == IID_TaskbarApplet ) 47 else if ( uuid == IID_TaskbarApplet )
49 *iface = this; 48 *iface = this;
50
51 if ( *iface ) { 49 if ( *iface ) {
52 (*iface)->addRef(); 50 (*iface)->addRef();
53 return QS_OK; 51 return QS_OK;
54 } 52 }
55 return QE_NOINTERFACE; 53 return QS_FALSE;
56} 54}
57Q_EXPORT_INTERFACE() 55Q_EXPORT_INTERFACE()
58{ 56{
59 Q_CREATE_INSTANCE( SimpleAlarmDaemonApplet ) 57 Q_CREATE_INSTANCE( SimpleAlarmDaemonApplet )
60} 58}