summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore 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.cpp47
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--microkde/kapplication.cpp4
7 files changed, 35 insertions, 44 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,5 +1,5 @@
WARNING:
-YOU MAY GET UNEXSPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS,
+YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS,
IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM
THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES
HAVE TOO MUCH DIFFERENCE.
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
@@ -8,6 +8,13 @@ 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.
+But the alarm applet should work again.
+
********** VERSION 1.9.15 ************
@@ -27,7 +34,8 @@ Hide the filter action in toolbar
and added icons for undo/delete/redo in toolbar.
Change in OM/Pi ViewMail dialog:
-When 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).
+When 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).
Fixed a crash when deleting mail-accounts in OM/Pi.
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 38a744f..3277036 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -14,7 +14,7 @@ SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
{
- delete mApplet;
+ //delete mApplet;
mApplet = 0;
}
@@ -41,18 +41,19 @@ int SimpleAlarmDaemonApplet::position() const
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();
+ (*iface)->addRef();
return QS_OK;
}
- return QE_NOCOMPONENT;
+ return QE_NOINTERFACE;
}
-
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( SimpleAlarmDaemonApplet )
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5d7b066..97b4a03 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1078,7 +1078,11 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
e->ignore();
break;
case Qt::Key_S:
- if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) {
+ if ( e->state() == Qt::ControlButton ) {
+ e->ignore();
+ break;
+ }
+ if ( e->state() == Qt::ShiftButton ) {
mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
reparentTodo();
e->accept();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a652c05..6bc5b3a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -558,8 +558,6 @@ void MainWindow::initActions()
} else
pathString += "iconsmini/";
configureAgendaMenu->setCheckable( true );
- configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
- configureAgendaMenu->insertSeparator();
configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
configureAgendaMenu->insertItem(i18n("Small"), 6 );
configureAgendaMenu->insertItem(i18n("Medium"), 8 );
@@ -607,7 +605,10 @@ void MainWindow::initActions()
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleFilter() ) );
-
+ action = new QAction( i18n("Toggle Allday"), i18n("Toggle Allday"), 0, this );
+ action->addTo( viewMenu );
+ connect( action, SIGNAL( activated() ),
+ mView, SLOT( toggleAllDaySize() ) );
viewMenu->insertSeparator();
icon = loadPixmap( pathString + "picker" );
@@ -1138,30 +1139,17 @@ void MainWindow::displayText( QString text ,QString cap )
#endif
dia.exec();
}
-void MainWindow::displayFile( QString fn, QString cap )
-{
- QString fileName = resourcePath() + fn;
- QString text;
- QFile file( fileName );
- if (!file.open( IO_ReadOnly ) ) {
- return ;
- }
- QTextStream ts( &file );
- text = ts.read();
- file.close();
- displayText( text, cap);
-}
void MainWindow::features()
{
- displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
+ KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
}
void MainWindow::usertrans()
{
- displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
+ KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
}
void MainWindow::kdesynchowto()
@@ -1178,7 +1166,7 @@ void MainWindow::synchowto()
}
void MainWindow::faq()
{
- displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
+ KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
}
void MainWindow::whatsNew()
@@ -1208,7 +1196,7 @@ void MainWindow::about()
}
void MainWindow::keyBindings()
{
- QString cap = i18n("Key bindings KOrganizer/Pi");
+ QString cap = i18n("KO/Pi Keys + Colors");
QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
@@ -1260,20 +1248,13 @@ void MainWindow::keyBindings()
i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") +
i18n("<p><b>White</b>: Item readonly</p>\n");
- displayText( text, cap);
-
+ displayText( text, cap);
}
void MainWindow::aboutAutoSaving()
{
- QMessageBox* msg;
- msg = new QMessageBox( i18n("Auto Saving in KOrganizer/Pi"),
- 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,
- QMessageBox::Ok,
- QMessageBox::NoButton,
- QMessageBox::NoButton);
- msg->exec();
- delete msg;
-
+ 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");
+
+ KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text);
}
void MainWindow::aboutKnownBugs()
@@ -1726,10 +1707,6 @@ void MainWindow::configureAgenda( int item )
KOPrefs *p = KOPrefs::instance();
int i;
- if ( item == 1 ) {
- mView->toggleAllDaySize();
- return;
- }
// do not allow 4 for widgets higher than 480
// if ( QApplication::desktop()->height() > 480 ) {
// if ( item == 4 )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ed65d36..96e627e 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -87,7 +87,6 @@ class MainWindow : public QMainWindow
protected:
void displayText( QString, QString);
- void displayFile( QString, QString);
void enableIncidenceActions( bool );
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index d6f556d..21aa0a4 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -2,6 +2,7 @@
#include <stdio.h>
#include "kapplication.h"
+#include "ktextedit.h"
#include <qapplication.h>
#include <qstring.h>
#include <qfile.h>
@@ -95,7 +96,8 @@ void KApplication::showText(QString caption, QString text)
QVBoxLayout* lay = new QVBoxLayout( &dia );
lay->setSpacing( 3 );
lay->setMargin( 3 );
- QTextBrowser tb ( &dia );
+ KTextEdit tb ( &dia );
+ tb.setWordWrap( QMultiLineEdit::WidgetWidth );
lay->addWidget( &tb );
tb.setText( text );
#ifdef DESKTOP_VERSION