-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 6 | ||||
-rw-r--r-- | kabc/addresseedialog.cpp | 46 | ||||
-rw-r--r-- | kalarmd/alarmdialog.cpp | 11 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 19 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 4 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 35 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 1 |
8 files changed, 99 insertions, 34 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6b739ba..711509d 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1334,2 +1334,5 @@ | |||
1334 | { "( %1 before )","( %1 vorher )" }, | 1334 | { "( %1 before )","( %1 vorher )" }, |
1335 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, | ||
1336 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, | ||
1337 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, | ||
1335 | { "","" }, | 1338 | { "","" }, |
@@ -1340,4 +1343 @@ | |||
1340 | { "","" }, | { "","" }, | |
1341 | { "","" }, | ||
1342 | { "","" }, | ||
1343 | { "","" } \ No newline at end of file | ||
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 648e780..19b52bb 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -128,5 +128,6 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | |||
128 | SLOT( addressBookChanged() ) ); | 128 | SLOT( addressBookChanged() ) ); |
129 | #if 0 | ||
129 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), | 130 | connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ), |
130 | SLOT( addressBookChanged() ) ); | 131 | SLOT( addressBookChanged() ) ); |
131 | 132 | #endif | |
132 | loadAddressBook(); | 133 | loadAddressBook(); |
@@ -282,4 +283,25 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent ) | |||
282 | Addressee addressee; | 283 | Addressee addressee; |
283 | int result = dlg->exec(); | 284 | #ifdef DESKTOP_VERSION |
285 | static int geoX = 0; | ||
286 | static int geoY = 0; | ||
287 | static int geoW = 0; | ||
288 | static int geoH = 0; | ||
289 | if ( !geoX && ! geoY && !geoW &&!geoH ) { | ||
290 | geoX = dlg->geometry().x(); | ||
291 | geoY = dlg->geometry().y(); | ||
292 | geoW = dlg->width(); | ||
293 | geoH = dlg->height(); | ||
294 | } else { | ||
295 | dlg->show(); | ||
296 | dlg->setGeometry(geoX , geoY,geoW , geoH ); | ||
284 | 297 | ||
298 | } | ||
299 | #endif | ||
300 | int result = dlg->exec(); | ||
301 | #ifdef DESKTOP_VERSION | ||
302 | geoX = dlg->geometry().x(); | ||
303 | geoY = dlg->geometry().y(); | ||
304 | geoW = dlg->width(); | ||
305 | geoH = dlg->height(); | ||
306 | #endif | ||
285 | if ( result == QDialog::Accepted ) { | 307 | if ( result == QDialog::Accepted ) { |
@@ -296,5 +318,25 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) | |||
296 | Addressee::List addressees; | 318 | Addressee::List addressees; |
319 | static int geoX = 0; | ||
320 | static int geoY = 0; | ||
321 | static int geoW = 0; | ||
322 | static int geoH = 0; | ||
297 | if ( QApplication::desktop()->width() <= 640 ) | 323 | if ( QApplication::desktop()->width() <= 640 ) |
298 | dlg->showMaximized(); | 324 | dlg->showMaximized(); |
325 | else { | ||
326 | if ( !geoX && ! geoY && !geoW &&!geoH ) { | ||
327 | geoX = dlg->geometry().x(); | ||
328 | geoY = dlg->geometry().y(); | ||
329 | geoW = dlg->width(); | ||
330 | geoH = dlg->height(); | ||
331 | } else { | ||
332 | dlg->show(); | ||
333 | dlg->setGeometry(geoX , geoY,geoW , geoH ); | ||
334 | |||
335 | } | ||
336 | } | ||
299 | int result = dlg->exec(); | 337 | int result = dlg->exec(); |
338 | geoX = dlg->geometry().x(); | ||
339 | geoY = dlg->geometry().y(); | ||
340 | geoW = dlg->width(); | ||
341 | geoH = dlg->height(); | ||
300 | if ( result == QDialog::Accepted ) { | 342 | if ( result == QDialog::Accepted ) { |
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index bdeee4a..53ff488 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp | |||
@@ -34,2 +34,3 @@ | |||
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qregexp.h> | ||
35 | #ifndef DESKTOP_VERSION | 36 | #ifndef DESKTOP_VERSION |
@@ -60,3 +61,3 @@ | |||
60 | AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | 61 | AlarmDialog::AlarmDialog(QWidget *parent,const char *name) |
61 | : QDialog (parent, name, true, Qt::WStyle_StaysOnTop ) | 62 | : QDialog (parent, name, true, Qt::WStyle_Customize |Qt::WStyle_StaysOnTop | Qt::WStyle_DialogBorder) |
62 | { | 63 | { |
@@ -234,3 +235,5 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo | |||
234 | mMissedAlarmsCombo->show(); | 235 | mMissedAlarmsCombo->show(); |
235 | mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() ); | 236 | QString newItem = mMessage->text().stripWhiteSpace(); |
237 | newItem.replace( QRegExp("\n"), QString(" ") ); | ||
238 | mMissedAlarmsCombo->insertItem( newItem ); | ||
236 | mMissedAlarms->setText( "Missed alarms:"); | 239 | mMissedAlarms->setText( "Missed alarms:"); |
@@ -271,5 +274,5 @@ void AlarmDialog::playSound () | |||
271 | setActiveWindow(); | 274 | setActiveWindow(); |
272 | mSuspendSpin->setFocus(); | ||
273 | raise(); | 275 | raise(); |
274 | repaint(); | 276 | mSuspendSpin->setFocus(); |
277 | |||
275 | 278 | ||
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index beb19d9..76cce26 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -532,2 +532,7 @@ void CalendarView::startAlarm( QString mess , QString filename) | |||
532 | { | 532 | { |
533 | |||
534 | topLevelWidget()->showNormal(); | ||
535 | topLevelWidget()->setActiveWindow(); | ||
536 | topLevelWidget()->raise(); | ||
537 | |||
533 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); | 538 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); |
@@ -4096,3 +4101,3 @@ void CalendarView::showNextAlarms() | |||
4096 | 4101 | ||
4097 | message = i18n("The next alarm is in:\n"); | 4102 | //message = i18n("The next alarm is in:\n"); |
4098 | if ( days > 1 ) | 4103 | if ( days > 1 ) |
@@ -4109,3 +4114,6 @@ void CalendarView::showNextAlarms() | |||
4109 | message += i18n("1 minute\n"); | 4114 | message += i18n("1 minute\n"); |
4110 | 4115 | if ( message.isEmpty() ) | |
4116 | message = i18n("The next alarm is in\nless than one minute!"); | ||
4117 | else | ||
4118 | message = i18n("The next alarm is in:\n") + message; | ||
4111 | message += i18n("\n(%1)\n\n%2\n(%3)\n").arg( KGlobal::locale()->formatDateTime(nextA , false)).arg(sum ).arg( KGlobal::locale()->formatDateTime(nextAl , false)) ; | 4119 | message += i18n("\n(%1)\n\n%2\n(%3)\n").arg( KGlobal::locale()->formatDateTime(nextA , false)).arg(sum ).arg( KGlobal::locale()->formatDateTime(nextAl , false)) ; |
@@ -4115,2 +4123,9 @@ void CalendarView::showNextAlarms() | |||
4115 | } | 4123 | } |
4124 | #ifdef DESKTOP_VERSION | ||
4125 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | ||
4126 | message += i18n("\nThe internal alarm notification is disabled!\n"); | ||
4127 | message += i18n("Enable it in the settings menu, TAB alarm."); | ||
4128 | } | ||
4129 | |||
4130 | #endif | ||
4116 | KMessageBox::information( this, message); | 4131 | KMessageBox::information( this, message); |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index d450a97..6d1e6d5 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -155,3 +155,3 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | |||
155 | while (y < cy + ch+mCellHeight) { | 155 | while (y < cy + ch+mCellHeight) { |
156 | p->drawLine(startW-tw2 ,y,cw+2,y); | 156 | p->drawLine(startW-tw2+1 ,y,cw+2,y); |
157 | hour.setNum(cell); | 157 | hour.setNum(cell); |
@@ -217,3 +217,3 @@ void TimeLabels::updateConfig() | |||
217 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 217 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
218 | resizeContents(50,mRows * mCellHeight); | 218 | resizeContents(mMiniWidth,mRows * mCellHeight+1); |
219 | } | 219 | } |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index b14ca43..abc80d4 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -229,7 +229,5 @@ void KOEditorGeneral::pickAlarmSound() | |||
229 | qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); | 229 | qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); |
230 | //QString prefix = mAlarmSound; | 230 | |
231 | if (!mAlarmSoundButton->isOn()) { | 231 | bool oldState = mAlarmSoundButton->isOn(); |
232 | mAlarmSoundButton->setOn(true); | 232 | |
233 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); | ||
234 | } else { | ||
235 | QString fileName(KFileDialog::getOpenFileName(mAlarmSound, | 233 | QString fileName(KFileDialog::getOpenFileName(mAlarmSound, |
@@ -243,9 +241,10 @@ void KOEditorGeneral::pickAlarmSound() | |||
243 | mAlarmSoundButton->setOn(true); | 241 | mAlarmSoundButton->setOn(true); |
242 | QToolTip::add(mAlarmProgramButton, i18n("No program set")); | ||
244 | } else { | 243 | } else { |
245 | mAlarmProgramButton->setOn(true); | 244 | mAlarmProgramButton->setOn(oldState); |
246 | mAlarmSoundButton->setOn(false); | 245 | mAlarmSoundButton->setOn(!oldState); |
246 | |||
247 | 247 | ||
248 | } | 248 | } |
249 | } | 249 | |
250 | #if 0 | ||
251 | if (mAlarmProgramButton->isOn()) | 250 | if (mAlarmProgramButton->isOn()) |
@@ -254,3 +253,3 @@ void KOEditorGeneral::pickAlarmSound() | |||
254 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); | 253 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); |
255 | #endif | 254 | |
256 | } | 255 | } |
@@ -259,6 +258,4 @@ void KOEditorGeneral::pickAlarmProgram() | |||
259 | { | 258 | { |
260 | if (!mAlarmProgramButton->isOn()) { | 259 | bool oldState = mAlarmProgramButton->isOn(); |
261 | mAlarmProgramButton->setOn(true); | 260 | |
262 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); | ||
263 | } else { | ||
264 | QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0)); | 261 | QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0)); |
@@ -271,8 +268,8 @@ void KOEditorGeneral::pickAlarmProgram() | |||
271 | mAlarmProgramButton->setOn(true); | 268 | mAlarmProgramButton->setOn(true); |
269 | QToolTip::add(mAlarmSoundButton, i18n("No sound set")); | ||
272 | } else { | 270 | } else { |
273 | mAlarmProgramButton->setOn(false); | 271 | mAlarmProgramButton->setOn(!oldState); |
274 | mAlarmSoundButton->setOn(true); | 272 | mAlarmSoundButton->setOn(oldState); |
275 | } | ||
276 | } | 273 | } |
277 | #if 0 | 274 | |
278 | if (mAlarmProgramButton->isOn()) | 275 | if (mAlarmProgramButton->isOn()) |
@@ -281,3 +278,3 @@ void KOEditorGeneral::pickAlarmProgram() | |||
281 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); | 278 | ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); |
282 | #endif | 279 | |
283 | } | 280 | } |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 01cf0ff..395325c 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -206,2 +206,6 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e) | |||
206 | } | 206 | } |
207 | void KOTodoListView::wheelEvent (QWheelEvent *e) | ||
208 | { | ||
209 | QListView::wheelEvent (e); | ||
210 | } | ||
207 | 211 | ||
@@ -229,5 +233,7 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e) | |||
229 | mMousePressed = false; | 233 | mMousePressed = false; |
230 | if (! rootClicked ) { | 234 | if (! rootClicked && !( e->button() == RightButton) ) { |
231 | mPressPos = e->pos(); | 235 | mPressPos = e->pos(); |
232 | mMousePressed = true; | 236 | mMousePressed = true; |
237 | } else { | ||
238 | mMousePressed = false; | ||
233 | } | 239 | } |
@@ -1084,3 +1090,3 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) | |||
1084 | } else { | 1090 | } else { |
1085 | if ( row == 1 ) { | 1091 | if ( row == 1 || row == 2 ) { |
1086 | mActiveItem = (KOTodoViewItem *) item; | 1092 | mActiveItem = (KOTodoViewItem *) item; |
@@ -1273,2 +1279,3 @@ void KOTodoView::purgeCompleted() | |||
1273 | emit purgeCompletedSignal(); | 1279 | emit purgeCompletedSignal(); |
1280 | |||
1274 | } | 1281 | } |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index e553d0e..39976cf 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -70,2 +70,3 @@ class KOTodoListView : public KListView | |||
70 | protected: | 70 | protected: |
71 | void wheelEvent (QWheelEvent *e); | ||
71 | void contentsDragEnterEvent(QDragEnterEvent *); | 72 | void contentsDragEnterEvent(QDragEnterEvent *); |