summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--kaddressbook/filtereditdialog.cpp2
-rw-r--r--kaddressbook/kabcore.cpp3
-rw-r--r--korganizer/koagenda.cpp3
-rw-r--r--korganizer/koeditorgeneral.cpp15
-rw-r--r--korganizer/koeditorgeneral.h1
-rw-r--r--libkdepim/ksyncmanager.cpp15
-rw-r--r--microkde/kglobalsettings.cpp8
9 files changed, 37 insertions, 14 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 706fb7f..1c2bff8 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -6,2 +6,4 @@ Fixed another SMTP problem in OM/Pi.
Some small changed in the new datenavigator in KO/Pi.
+Changed default setting for new filter in KA/Pi to "exclude categories".
+Changed the default font size for 640x480 display
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index b976f1b..c6cd0ae 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1304,3 +1304,3 @@
{ "Show current time","Zeige aktuelle Zeit" },
-{ "","" },
+{ "Edit new item","Bearbeite neuen Eintrag" },
{ "","" },
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 1194406..ef9b979 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -160,5 +160,5 @@ void FilterEditDialog::initGUI()
QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
- radio->setChecked( true );
//mMatchRuleGroup->insert( radio );
radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
+ radio->setChecked( true );
//mMatchRuleGroup->insert( radio );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e8f6132..59aa5a5 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -3188,2 +3188,3 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
+ syncManager->hideProgressBar();
if ( syncOK ) {
@@ -3239,2 +3240,3 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource)
syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
+ syncManager->hideProgressBar();
if ( syncOK ) {
@@ -3286,2 +3288,3 @@ bool KABCore::syncPhone()
syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
+ syncManager->hideProgressBar();
if ( syncOK ) {
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 5420822..2820ca2 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -550,2 +550,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
case QEvent::MouseButtonDblClick:
+ blockMoving = false;
+ leftMouseDown = false;
+ rightMouseDown = false;
if (object == viewport()) {
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 496f125..4ee5292 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -227,2 +227,3 @@ void KOEditorGeneral::pickAlarmSound()
+ qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
//QString prefix = mAlarmSound;
@@ -234,2 +235,3 @@ void KOEditorGeneral::pickAlarmSound()
mAlarmSoundButton->setOn(false);
+ pickAlarmProgram();
} else {
@@ -254,3 +256,3 @@ void KOEditorGeneral::pickAlarmSound()
if ( mAlarmSoundButton->isOn())
- ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) );
+ ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
}
@@ -265,4 +267,5 @@ void KOEditorGeneral::pickAlarmProgram()
mAlarmSoundButton->setOn(true);
+ pickAlarmSound();
} else {
- QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ") , 0));
+ QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0));
if (!fileName.isEmpty()) {
@@ -282,3 +285,3 @@ void KOEditorGeneral::pickAlarmProgram()
if ( mAlarmSoundButton->isOn())
- ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) );
+ ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
}
@@ -319,3 +322,5 @@ void KOEditorGeneral::enableAlarmEdit(bool enable)
else {
- ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item"));
+ ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
+ //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
+
@@ -365,2 +370,3 @@ void KOEditorGeneral::setDefaults(bool allDay)
+ mAlarmMessage = i18n("Edit new item");
enableAlarmEdit( !allDay );
@@ -396,2 +402,3 @@ void KOEditorGeneral::readIncidence(Incidence *event)
+ mAlarmMessage = i18n("Edit") +" "+event->summary();
mAlarmIncrCombo->setCurrentItem(0);
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index de8edaf..f4728c7 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -110,2 +110,3 @@ class KOEditorGeneral : public QObject
QString mAlarmProgram;
+ QString mAlarmMessage;
};
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 7319285..184cb39 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -67,9 +67,3 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
mWriteBackInPast = 2;
- int w = 300;
- if ( QApplication::desktop()->width() < 320 )
- w = 220;
- int h = bar->sizeHint().height() ;
- int dw = QApplication::desktop()->width();
- int dh = QApplication::desktop()->height();
- bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+
@@ -1011,2 +1005,9 @@ void KSyncManager::showProgressBar(int percentage, QString caption, int total)
{
+ int w = 300;
+ if ( QApplication::desktop()->width() < 320 )
+ w = 220;
+ int h = bar->sizeHint().height() ;
+ int dw = QApplication::desktop()->width();
+ int dh = QApplication::desktop()->height();
+ bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
bar->setCaption (caption);
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index e57defe..b6d2feb 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -10,4 +10,10 @@ QFont KGlobalSettings::generalFont()
int size = 12;
- if (QApplication::desktop()->width() < 480 )
+ if (QApplication::desktop()->width() < 480 ) {
size = 10;
+ }
+#ifndef DESKTOP_VERSION
+ else
+ if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+ size = 18;
+#endif
QFont f = QApplication::font();