summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-25 00:08:08 (UTC)
committer zautrix <zautrix>2005-03-25 00:08:08 (UTC)
commit7c2e130ddd194f1c4b5365af6999a27c08232f4b (patch) (unidiff)
tree75665681327ee49d7650f4d840b5c8c772180fb4
parent5cf054b82738d65f9b0a34ccb51c993ee4a0189f (diff)
downloadkdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.zip
kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.gz
kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.bz2
fixes
Diffstat (more/less context) (ignore 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
@@ -4,6 +4,8 @@ Info about the changes in new versions of KDE-Pim/Pi
4 4
5Fixed another SMTP problem in OM/Pi. 5Fixed another SMTP problem in OM/Pi.
6Some small changed in the new datenavigator in KO/Pi. 6Some small changed in the new datenavigator in KO/Pi.
7Changed default setting for new filter in KA/Pi to "exclude categories".
8Changed the default font size for 640x480 display
7 9
8********** VERSION 2.0.20 ************ 10********** VERSION 2.0.20 ************
9 11
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 @@
1302{ "Journal/Details...","Journale/Details..." }, 1302{ "Journal/Details...","Journale/Details..." },
1303{ "Agenda View","Agenda Ansicht" }, 1303{ "Agenda View","Agenda Ansicht" },
1304{ "Show current time","Zeige aktuelle Zeit" }, 1304{ "Show current time","Zeige aktuelle Zeit" },
1305{ "","" }, 1305{ "Edit new item","Bearbeite neuen Eintrag" },
1306{ "","" }, 1306{ "","" },
1307{ "","" }, 1307{ "","" },
1308{ "","" }, 1308{ "","" },
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()
158 mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page ); 158 mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page );
159 mMatchRuleGroup->setExclusive( true ); 159 mMatchRuleGroup->setExclusive( true );
160 QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup ); 160 QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
161 radio->setChecked( true );
162 //mMatchRuleGroup->insert( radio ); 161 //mMatchRuleGroup->insert( radio );
163 radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup ); 162 radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
163 radio->setChecked( true );
164 //mMatchRuleGroup->insert( radio ); 164 //mMatchRuleGroup->insert( radio );
165 topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 ); 165 topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
166 166
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)
3186 // qDebug("Name %s ", (*it).familyName().latin1()); 3186 // qDebug("Name %s ", (*it).familyName().latin1());
3187 //} 3187 //}
3188 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); 3188 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
3189 syncManager->hideProgressBar();
3189 if ( syncOK ) { 3190 if ( syncOK ) {
3190 if ( syncManager->mWriteBackFile ) 3191 if ( syncManager->mWriteBackFile )
3191 { 3192 {
@@ -3237,6 +3238,7 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource)
3237 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); 3238 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
3238 message(i18n("Synchronizing..."),false); 3239 message(i18n("Synchronizing..."),false);
3239 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); 3240 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
3241 syncManager->hideProgressBar();
3240 if ( syncOK ) { 3242 if ( syncOK ) {
3241 if ( syncManager->mWriteBackFile ) { 3243 if ( syncManager->mWriteBackFile ) {
3242 abLocal.removeSyncAddressees( false ); 3244 abLocal.removeSyncAddressees( false );
@@ -3284,6 +3286,7 @@ bool KABCore::syncPhone()
3284 abLocal.preparePhoneSync( mCurrentSyncDevice, true ); 3286 abLocal.preparePhoneSync( mCurrentSyncDevice, true );
3285 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); 3287 abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
3286 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); 3288 syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
3289 syncManager->hideProgressBar();
3287 if ( syncOK ) { 3290 if ( syncOK ) {
3288 if ( syncManager->mWriteBackFile ) { 3291 if ( syncManager->mWriteBackFile ) {
3289 abLocal.removeSyncAddressees( true ); 3292 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)
548 break; 548 break;
549 549
550 case QEvent::MouseButtonDblClick: 550 case QEvent::MouseButtonDblClick:
551 blockMoving = false;
552 leftMouseDown = false;
553 rightMouseDown = false;
551 if (object == viewport()) { 554 if (object == viewport()) {
552 selectItem(0); 555 selectItem(0);
553 int x,y; 556 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)
225void KOEditorGeneral::pickAlarmSound() 225void KOEditorGeneral::pickAlarmSound()
226{ 226{
227 227
228 qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
228 //QString prefix = mAlarmSound; 229 //QString prefix = mAlarmSound;
229 if (!mAlarmSoundButton->isOn()) { 230 if (!mAlarmSoundButton->isOn()) {
230 //mAlarmSound = ""; 231 //mAlarmSound = "";
@@ -232,6 +233,7 @@ void KOEditorGeneral::pickAlarmSound()
232 QToolTip::add(mAlarmSoundButton, i18n("No sound set")); 233 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
233 mAlarmProgramButton->setOn(true); 234 mAlarmProgramButton->setOn(true);
234 mAlarmSoundButton->setOn(false); 235 mAlarmSoundButton->setOn(false);
236 pickAlarmProgram();
235 } else { 237 } else {
236 QString fileName(KFileDialog::getOpenFileName(mAlarmSound, 238 QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
237 i18n("*.wav|Wav Files"), 0)); 239 i18n("*.wav|Wav Files"), 0));
@@ -252,7 +254,7 @@ void KOEditorGeneral::pickAlarmSound()
252 if (mAlarmProgramButton->isOn()) 254 if (mAlarmProgramButton->isOn())
253 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); 255 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
254 if ( mAlarmSoundButton->isOn()) 256 if ( mAlarmSoundButton->isOn())
255 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) ); 257 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
256} 258}
257 259
258void KOEditorGeneral::pickAlarmProgram() 260void KOEditorGeneral::pickAlarmProgram()
@@ -263,8 +265,9 @@ void KOEditorGeneral::pickAlarmProgram()
263 QToolTip::add(mAlarmProgramButton, i18n("No program set")); 265 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
264 mAlarmProgramButton->setOn(false); 266 mAlarmProgramButton->setOn(false);
265 mAlarmSoundButton->setOn(true); 267 mAlarmSoundButton->setOn(true);
268 pickAlarmSound();
266 } else { 269 } else {
267 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ") , 0)); 270 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0));
268 if (!fileName.isEmpty()) { 271 if (!fileName.isEmpty()) {
269 mAlarmProgram = fileName; 272 mAlarmProgram = fileName;
270 QToolTip::remove(mAlarmProgramButton); 273 QToolTip::remove(mAlarmProgramButton);
@@ -280,7 +283,7 @@ void KOEditorGeneral::pickAlarmProgram()
280 if (mAlarmProgramButton->isOn()) 283 if (mAlarmProgramButton->isOn())
281 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); 284 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
282 if ( mAlarmSoundButton->isOn()) 285 if ( mAlarmSoundButton->isOn())
283 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) ); 286 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
284} 287}
285 288
286 289
@@ -317,7 +320,9 @@ void KOEditorGeneral::enableAlarmEdit(bool enable)
317 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 320 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
318 } 321 }
319 else { 322 else {
320 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item")); 323 ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
324 //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
325
321 326
322 } 327 }
323 mAlarmTimeEdit->setEnabled(enable); 328 mAlarmTimeEdit->setEnabled(enable);
@@ -363,6 +368,7 @@ void KOEditorGeneral::setDefaults(bool allDay)
363 mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName()); 368 mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName());
364#endif 369#endif
365 370
371 mAlarmMessage = i18n("Edit new item");
366 enableAlarmEdit( !allDay ); 372 enableAlarmEdit( !allDay );
367 373
368 // TODO: Implement a KPrefsComboItem to solve this in a clean way. 374 // TODO: Implement a KPrefsComboItem to solve this in a clean way.
@@ -394,6 +400,7 @@ void KOEditorGeneral::setSecrecy( int num )
394void KOEditorGeneral::readIncidence(Incidence *event) 400void KOEditorGeneral::readIncidence(Incidence *event)
395{ 401{
396 402
403 mAlarmMessage = i18n("Edit") +" "+event->summary();
397 mAlarmIncrCombo->setCurrentItem(0); 404 mAlarmIncrCombo->setCurrentItem(0);
398 mSummaryEdit->setEditText(event->summary()); 405 mSummaryEdit->setEditText(event->summary());
399 mLocationEdit->setEditText(event->location()); 406 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
108 QString getFittingPath( const QString ) ; 108 QString getFittingPath( const QString ) ;
109 QString mAlarmSound; 109 QString mAlarmSound;
110 QString mAlarmProgram; 110 QString mAlarmProgram;
111 QString mAlarmMessage;
111}; 112};
112 113
113#endif 114#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
65 bar = new QProgressBar ( 1, 0 ); 65 bar = new QProgressBar ( 1, 0 );
66 bar->setCaption (""); 66 bar->setCaption ("");
67 mWriteBackInPast = 2; 67 mWriteBackInPast = 2;
68 int w = 300; 68
69 if ( QApplication::desktop()->width() < 320 )
70 w = 220;
71 int h = bar->sizeHint().height() ;
72 int dw = QApplication::desktop()->width();
73 int dh = QApplication::desktop()->height();
74 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
75 69
76} 70}
77 71
@@ -1009,6 +1003,13 @@ void KSyncManager::showProgressBar(int percentage, QString caption, int total)
1009{ 1003{
1010 if (!bar->isVisible()) 1004 if (!bar->isVisible())
1011 { 1005 {
1006 int w = 300;
1007 if ( QApplication::desktop()->width() < 320 )
1008 w = 220;
1009 int h = bar->sizeHint().height() ;
1010 int dw = QApplication::desktop()->width();
1011 int dh = QApplication::desktop()->height();
1012 bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
1012 bar->setCaption (caption); 1013 bar->setCaption (caption);
1013 bar->setTotalSteps ( total ) ; 1014 bar->setTotalSteps ( total ) ;
1014 bar->show(); 1015 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 @@
8QFont KGlobalSettings::generalFont() 8QFont KGlobalSettings::generalFont()
9{ 9{
10 int size = 12; 10 int size = 12;
11 if (QApplication::desktop()->width() < 480 ) 11 if (QApplication::desktop()->width() < 480 ) {
12 size = 10; 12 size = 10;
13 }
14#ifndef DESKTOP_VERSION
15 else
16 if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
17 size = 18;
18#endif
13 QFont f = QApplication::font(); 19 QFont f = QApplication::font();
14 //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1()); 20 //qDebug("pointsize %d %s", f.pointSize(),f.family().latin1());
15 f.setPointSize( size ); 21 f.setPointSize( size );