summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/SyncHowto.txt2
-rw-r--r--bin/kdepim/WhatsNew.txt10
-rw-r--r--kalarmd/simplealarmdaemonapplet.cpp9
-rw-r--r--korganizer/kotodoview.cpp6
-rw-r--r--korganizer/mainwindow.cpp43
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--microkde/kapplication.cpp4
7 files changed, 33 insertions, 42 deletions
diff --git a/bin/kdepim/SyncHowto.txt b/bin/kdepim/SyncHowto.txt
index 5874fc3..6c1da16 100644
--- a/bin/kdepim/SyncHowto.txt
+++ b/bin/kdepim/SyncHowto.txt
@@ -1,3 +1,3 @@
1WARNING: 1WARNING:
2YOU MAY GET UNEXSPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS, 2YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS,
3IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM 3IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 1a8b885..df0b2eb 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -10,2 +10,9 @@ Added 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).
12
13Fixed a strange problem in KO/Pi alarm applet.
14Did not find the actual problem,
15such that now Qtopia reboots if deinstalling the alarm applet.
16But the alarm applet should work again.
17
11 18
@@ -29,3 +36,4 @@ and added icons for undo/delete/redo in toolbar.
29Change in OM/Pi ViewMail dialog: 36Change in OM/Pi ViewMail dialog:
30When clicking on the "delete" icon the mail is deleted after confirmation as usual. But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any). 37When clicking on the "delete" icon the mail is deleted after confirmation as usual.
38But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
31 39
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 38a744f..3277036 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -16,3 +16,3 @@ SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
16{ 16{
17 delete mApplet; 17 //delete mApplet;
18 mApplet = 0; 18 mApplet = 0;
@@ -43,2 +43,3 @@ QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInte
43{ 43{
44 // qDebug(" SimpleAlarmDaemonApplet::queryInterface ");
44 *iface = 0; 45 *iface = 0;
@@ -48,9 +49,9 @@ QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInte
48 *iface = this; 49 *iface = this;
50
49 if ( *iface ) { 51 if ( *iface ) {
50 //(*iface)->addRef(); 52 (*iface)->addRef();
51 return QS_OK; 53 return QS_OK;
52 } 54 }
53 return QE_NOCOMPONENT; 55 return QE_NOINTERFACE;
54} 56}
55
56Q_EXPORT_INTERFACE() 57Q_EXPORT_INTERFACE()
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5d7b066..97b4a03 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1080,3 +1080,7 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
1080 case Qt::Key_S: 1080 case Qt::Key_S:
1081 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) { 1081 if ( e->state() == Qt::ControlButton ) {
1082 e->ignore();
1083 break;
1084 }
1085 if ( e->state() == Qt::ShiftButton ) {
1082 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); 1086 mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a652c05..6bc5b3a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -560,4 +560,2 @@ void MainWindow::initActions()
560 configureAgendaMenu->setCheckable( true ); 560 configureAgendaMenu->setCheckable( true );
561 configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
562 configureAgendaMenu->insertSeparator();
563 configureAgendaMenu->insertItem(i18n("Tiny"), 4 ); 561 configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
@@ -609,3 +607,6 @@ void MainWindow::initActions()
609 mView, SLOT( toggleFilter() ) ); 607 mView, SLOT( toggleFilter() ) );
610 608 action = new QAction( i18n("Toggle Allday"), i18n("Toggle Allday"), 0, this );
609 action->addTo( viewMenu );
610 connect( action, SIGNAL( activated() ),
611 mView, SLOT( toggleAllDaySize() ) );
611 612
@@ -1140,16 +1141,3 @@ void MainWindow::displayText( QString text ,QString cap )
1140} 1141}
1141void MainWindow::displayFile( QString fn, QString cap )
1142{
1143 QString fileName = resourcePath() + fn;
1144 QString text;
1145 QFile file( fileName );
1146 if (!file.open( IO_ReadOnly ) ) {
1147 return ;
1148 1142
1149 }
1150 QTextStream ts( &file );
1151 text = ts.read();
1152 file.close();
1153 displayText( text, cap);
1154}
1155void MainWindow::features() 1143void MainWindow::features()
@@ -1157,3 +1145,3 @@ void MainWindow::features()
1157 1145
1158 displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); 1146 KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
1159} 1147}
@@ -1163,3 +1151,3 @@ void MainWindow::usertrans()
1163 1151
1164 displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); 1152 KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
1165} 1153}
@@ -1180,3 +1168,3 @@ void MainWindow::faq()
1180{ 1168{
1181 displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); 1169 KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
1182 1170
@@ -1210,3 +1198,3 @@ void MainWindow::keyBindings()
1210{ 1198{
1211 QString cap = i18n("Key bindings KOrganizer/Pi"); 1199 QString cap = i18n("KO/Pi Keys + Colors");
1212 QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + 1200 QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
@@ -1263,3 +1251,2 @@ void MainWindow::keyBindings()
1263 displayText( text, cap); 1251 displayText( text, cap);
1264
1265} 1252}
@@ -1267,11 +1254,5 @@ void MainWindow::aboutAutoSaving()
1267{ 1254{
1268 QMessageBox* msg; 1255 QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n");
1269 msg = new QMessageBox( i18n("Auto Saving in KOrganizer/Pi"),
1270 i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"), QMessageBox::NoIcon,
1271 QMessageBox::Ok,
1272 QMessageBox::NoButton,
1273 QMessageBox::NoButton);
1274 msg->exec();
1275 delete msg;
1276 1256
1257 KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text);
1277 1258
@@ -1728,6 +1709,2 @@ void MainWindow::configureAgenda( int item )
1728 int i; 1709 int i;
1729 if ( item == 1 ) {
1730 mView->toggleAllDaySize();
1731 return;
1732 }
1733 // do not allow 4 for widgets higher than 480 1710 // do not allow 4 for widgets higher than 480
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ed65d36..96e627e 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -89,3 +89,2 @@ class MainWindow : public QMainWindow
89 void displayText( QString, QString); 89 void displayText( QString, QString);
90 void displayFile( QString, QString);
91 90
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index d6f556d..21aa0a4 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -4,2 +4,3 @@
4#include "kapplication.h" 4#include "kapplication.h"
5#include "ktextedit.h"
5#include <qapplication.h> 6#include <qapplication.h>
@@ -97,3 +98,4 @@ void KApplication::showText(QString caption, QString text)
97 lay->setMargin( 3 ); 98 lay->setMargin( 3 );
98 QTextBrowser tb ( &dia ); 99 KTextEdit tb ( &dia );
100 tb.setWordWrap( QMultiLineEdit::WidgetWidth );
99 lay->addWidget( &tb ); 101 lay->addWidget( &tb );