From 7c2e130ddd194f1c4b5365af6999a27c08232f4b Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 25 Mar 2005 00:08:08 +0000 Subject: fixes --- 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 @@ -4,6 +4,8 @@ Info about the changes in new versions of KDE-Pim/Pi 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 ********** VERSION 2.0.20 ************ 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 @@ -1302,7 +1302,7 @@ { "Journal/Details...","Journale/Details..." }, { "Agenda View","Agenda Ansicht" }, { "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 @@ -158,9 +158,9 @@ void FilterEditDialog::initGUI() mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page ); mMatchRuleGroup->setExclusive( true ); 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 ); topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e8f6132..59aa5a5 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -3186,6 +3186,7 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) // qDebug("Name %s ", (*it).familyName().latin1()); //} syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); + syncManager->hideProgressBar(); if ( syncOK ) { if ( syncManager->mWriteBackFile ) { @@ -3237,6 +3238,7 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); message(i18n("Synchronizing..."),false); syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); + syncManager->hideProgressBar(); if ( syncOK ) { if ( syncManager->mWriteBackFile ) { abLocal.removeSyncAddressees( false ); @@ -3284,6 +3286,7 @@ bool KABCore::syncPhone() abLocal.preparePhoneSync( mCurrentSyncDevice, true ); abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); + syncManager->hideProgressBar(); if ( syncOK ) { if ( syncManager->mWriteBackFile ) { abLocal.removeSyncAddressees( true ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 5420822..2820ca2 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -548,6 +548,9 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) break; case QEvent::MouseButtonDblClick: + blockMoving = false; + leftMouseDown = false; + rightMouseDown = false; if (object == viewport()) { selectItem(0); int x,y; diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 496f125..4ee5292 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -225,6 +225,7 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout) void KOEditorGeneral::pickAlarmSound() { + qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); //QString prefix = mAlarmSound; if (!mAlarmSoundButton->isOn()) { //mAlarmSound = ""; @@ -232,6 +233,7 @@ void KOEditorGeneral::pickAlarmSound() QToolTip::add(mAlarmSoundButton, i18n("No sound set")); mAlarmProgramButton->setOn(true); mAlarmSoundButton->setOn(false); + pickAlarmProgram(); } else { QString fileName(KFileDialog::getOpenFileName(mAlarmSound, i18n("*.wav|Wav Files"), 0)); @@ -252,7 +254,7 @@ void KOEditorGeneral::pickAlarmSound() if (mAlarmProgramButton->isOn()) ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); } void KOEditorGeneral::pickAlarmProgram() @@ -263,8 +265,9 @@ void KOEditorGeneral::pickAlarmProgram() QToolTip::add(mAlarmProgramButton, i18n("No program set")); mAlarmProgramButton->setOn(false); 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()) { mAlarmProgram = fileName; QToolTip::remove(mAlarmProgramButton); @@ -280,7 +283,7 @@ void KOEditorGeneral::pickAlarmProgram() if (mAlarmProgramButton->isOn()) ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); if ( mAlarmSoundButton->isOn()) - ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) ); + ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); } @@ -317,7 +320,9 @@ void KOEditorGeneral::enableAlarmEdit(bool enable) ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); } 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()); + } mAlarmTimeEdit->setEnabled(enable); @@ -363,6 +368,7 @@ void KOEditorGeneral::setDefaults(bool allDay) mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName()); #endif + mAlarmMessage = i18n("Edit new item"); enableAlarmEdit( !allDay ); // TODO: Implement a KPrefsComboItem to solve this in a clean way. @@ -394,6 +400,7 @@ void KOEditorGeneral::setSecrecy( int num ) void KOEditorGeneral::readIncidence(Incidence *event) { + mAlarmMessage = i18n("Edit") +" "+event->summary(); mAlarmIncrCombo->setCurrentItem(0); mSummaryEdit->setEditText(event->summary()); mLocationEdit->setEditText(event->location()); diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index de8edaf..f4728c7 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -108,6 +108,7 @@ class KOEditorGeneral : public QObject QString getFittingPath( const QString ) ; QString mAlarmSound; QString mAlarmProgram; + QString mAlarmMessage; }; #endif diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7319285..184cb39 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -65,13 +65,7 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ bar = new QProgressBar ( 1, 0 ); bar->setCaption (""); 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 ); + } @@ -1009,6 +1003,13 @@ void KSyncManager::showProgressBar(int percentage, QString caption, int total) { if (!bar->isVisible()) { + 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); bar->setTotalSteps ( total ) ; bar->show(); diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index e57defe..b6d2feb 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp @@ -8,8 +8,14 @@ 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(); //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); f.setPointSize( size ); -- cgit v0.9.0.2