-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 6 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index d6bf118..5e5ed4c 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -373,100 +373,100 @@ | |||
373 | { "Edit Address","Bearbeite Adresse" }, | 373 | { "Edit Address","Bearbeite Adresse" }, |
374 | { "Street:","Strasse:" }, | 374 | { "Street:","Strasse:" }, |
375 | { "Post office box:","Postfach:" }, | 375 | { "Post office box:","Postfach:" }, |
376 | { "Locality:","Stadt:" }, | 376 | { "Locality:","Stadt:" }, |
377 | { "Region:","Region:" }, | 377 | { "Region:","Region:" }, |
378 | { "Postal code:","PLZ:" }, | 378 | { "Postal code:","PLZ:" }, |
379 | { "Country:","Staat:" }, | 379 | { "Country:","Staat:" }, |
380 | { "This is the preferred address","Dies ist die bevorzugte Adresse" }, | 380 | { "This is the preferred address","Dies ist die bevorzugte Adresse" }, |
381 | { "New...","Neu..." }, | 381 | { "New...","Neu..." }, |
382 | { "Change Type","Ändere Art" }, | 382 | { "Change Type","Ändere Art" }, |
383 | { "Edit Address Type","Ändere Address Art" }, | 383 | { "Edit Address Type","Ändere Address Art" }, |
384 | { "Address Types","Address Art" }, | 384 | { "Address Types","Address Art" }, |
385 | { "Domestic","Inland" }, | 385 | { "Domestic","Inland" }, |
386 | { "International","International" }, | 386 | { "International","International" }, |
387 | { "Parcel","Paket" }, | 387 | { "Parcel","Paket" }, |
388 | { "Edit Contact Name","Ändere Kontakt Name" }, | 388 | { "Edit Contact Name","Ändere Kontakt Name" }, |
389 | { "Honorific prefixes:","Namensprefixes:" }, | 389 | { "Honorific prefixes:","Namensprefixes:" }, |
390 | { "Given name:","Vorname:" }, | 390 | { "Given name:","Vorname:" }, |
391 | { "Additional names:","Mittelnamen:" }, | 391 | { "Additional names:","Mittelnamen:" }, |
392 | { "Family names:","Nachname:" }, | 392 | { "Family names:","Nachname:" }, |
393 | { "Honorific suffixes:","Namenssuffixe:" }, | 393 | { "Honorific suffixes:","Namenssuffixe:" }, |
394 | { "Parse name automatically","Setze Namen automatisch" }, | 394 | { "Parse name automatically","Setze Namen automatisch" }, |
395 | { "Edit Phone Numbers","Bearbeite Telefonnummern" }, | 395 | { "Edit Phone Numbers","Bearbeite Telefonnummern" }, |
396 | { "Number","Nummer" }, | 396 | { "Number","Nummer" }, |
397 | { "Type","Typ" }, | 397 | { "Type","Typ" }, |
398 | { "Edit Phone Number","Bearbeite Telefonnummer" }, | 398 | { "Edit Phone Number","Bearbeite Telefonnummer" }, |
399 | { "Number:","Nummer:" }, | 399 | { "Number:","Nummer:" }, |
400 | { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" }, | 400 | { "This is the preferred phone number","Dies ist die bevorzugte Telefonnummer" }, |
401 | { "Types","Typen" }, | 401 | { "Types","Typen" }, |
402 | { "Messenger","Messenger" }, | 402 | { "Messenger","Messenger" }, |
403 | { "Other","Anderes" }, | 403 | { "Other","Anderes" }, |
404 | { "Video","Video" }, | 404 | { "Video","Video" }, |
405 | { "Mailbox","Mailbox" }, | 405 | { "Mailbox","Mailbox" }, |
406 | { "Modem","Modem" }, | 406 | { "Modem","Modem" }, |
407 | { "Car","Auto" }, | 407 | { "Car","Auto" }, |
408 | { "PCS","PCS" }, | 408 | { "PCS","PCS" }, |
409 | { "Category","Kategorie" }, | 409 | { "Category","Kategorie" }, |
410 | { "Select Categories","Wähle Kategorien" }, | 410 | { "Select Categories","Wähle Kategorien" }, |
411 | { " &Deselect All "," &Deselektiere alle " }, | 411 | { " &Deselect All "," &Deselektiere alle " }, |
412 | { " &Edit Categories "," B&earbeite Kategorien " }, | 412 | { " &Edit Categories "," B&earbeite Kategorien " }, |
413 | { "&OK","&OK" }, | 413 | { "&OK","&OK" }, |
414 | { "&Cancel","Abbre&chen" }, | 414 | { "&Cancel","Abbre&chen" }, |
415 | { "Configure","Konfiguriere" }, | 415 | { "Configure","Konfiguriere" }, |
416 | { "Default","Voreinstellungen" }, | 416 | { "Default","Voreinstellungen" }, |
417 | { "Addressbook","Adressbuch" }, | 417 | { "Addressbook","Adressbuch" }, |
418 | { "Details view font","Schriftart Detailansicht" }, | 418 | { "Details view font","Schriftart Detailansicht" }, |
419 | { "phone:123","phone:123" }, | 419 | { "phone:123","phone:123" }, |
420 | { "Search only after <return> key pressed","Suche nur nach <return> Taste" }, | 420 | { "Search only after <return> key pressed","Suche nur nach <return> Taste" }, |
421 | { "Honor KDE single click","Benutze KDE Einzelklick" }, | 421 | { "Show edit dialog on single click","Zeige Edit Dialog bei Einzelklick" }, |
422 | { "Automatic name parsing for new addressees","Automa. Name Parsen für neue Einträge" }, | 422 | { "Automatic name parsing for new contacts","Automa. Name Parsen für neue Kontakte" }, |
423 | { "Display List and Details at once (restart)","Zeige Liste und Details zusammen(neustart)" }, | 423 | { "Display List and Details at once (restart)","Zeige Liste und Details zusammen(neustart)" }, |
424 | { "Ask for quit when closing Ka/Pi","Vor Beenden von Ka/Pi nachfragen" }, | 424 | { "Show exit confirmation","Vor dem Beenden nachfragen" }, |
425 | { "General","Allgemein" }, | 425 | { "General","Allgemein" }, |
426 | { "Extensions (restart)","Extensions (restart)" }, | 426 | { "Extensions (restart)","Extensions (restart)" }, |
427 | { "Description","Beschreibungen" }, | 427 | { "Description","Beschreibungen" }, |
428 | { "Extensions","Extensions" }, | 428 | { "Extensions","Extensions" }, |
429 | { "Prefixes","Prefixe" }, | 429 | { "Prefixes","Prefixe" }, |
430 | { "Inclusions","Inclusions" }, | 430 | { "Inclusions","Inclusions" }, |
431 | { "Suffixes","Suffixe" }, | 431 | { "Suffixes","Suffixe" }, |
432 | { "Default formatted name:","Default format. Name:" }, | 432 | { "Default formatted name:","Default format. Name:" }, |
433 | { "Empty","Leer" }, | 433 | { "Empty","Leer" }, |
434 | { "Simple Name","Einfacher Name" }, | 434 | { "Simple Name","Einfacher Name" }, |
435 | { "Full Name","Voller Name" }, | 435 | { "Full Name","Voller Name" }, |
436 | { "Reverse Name","Namen umdrehen" }, | 436 | { "Reverse Name","Namen umdrehen" }, |
437 | { "Contact","Kontakt" }, | 437 | { "Contact","Kontakt" }, |
438 | { "Global","Allgemein" }, | 438 | { "Global","Allgemein" }, |
439 | { "Phone","Telefon" }, | 439 | { "Phone","Telefon" }, |
440 | { "SMS","SMS" }, | 440 | { "SMS","SMS" }, |
441 | { "Language:(needs restart)","Sprache:(Neustart)" }, | 441 | { "Language:(needs restart)","Sprache:(Neustart)" }, |
442 | { "English","English" }, | 442 | { "English","English" }, |
443 | { "German","Deutsch" }, | 443 | { "German","Deutsch" }, |
444 | { "French","Französisch" }, | 444 | { "French","Französisch" }, |
445 | { "Italian","Italienisch" }, | 445 | { "Italian","Italienisch" }, |
446 | { "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" }, | 446 | { "User defined (usertranslation.txt)","Benutzerdef. (usertranslation.txt)" }, |
447 | { "Time Format(nr):","Zeit Format(nr):" }, | 447 | { "Time Format(nr):","Zeit Format(nr):" }, |
448 | { "24:00","24:00" }, | 448 | { "24:00","24:00" }, |
449 | { "12:00am","12:00am" }, | 449 | { "12:00am","12:00am" }, |
450 | { "Week starts on Sunday","Woche beginnt Sonntags" }, | 450 | { "Week starts on Sunday","Woche beginnt Sonntags" }, |
451 | { "Locale","Locale" }, | 451 | { "Locale","Locale" }, |
452 | { "Date Format:","Datums Format:" }, | 452 | { "Date Format:","Datums Format:" }, |
453 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, | 453 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, |
454 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, | 454 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, |
455 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, | 455 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, |
456 | { "User defined","Benutzerdefiniert" }, | 456 | { "User defined","Benutzerdefiniert" }, |
457 | { "User long date:","Format langes Datum:" }, | 457 | { "User long date:","Format langes Datum:" }, |
458 | { "User short date:","Format kurzes Datum:" }, | 458 | { "User short date:","Format kurzes Datum:" }, |
459 | { "Daylight start:","Sommerzeit Start:" }, | 459 | { "Daylight start:","Sommerzeit Start:" }, |
460 | { "Daylight end:","Sommerzeit Ende:" }, | 460 | { "Daylight end:","Sommerzeit Ende:" }, |
461 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, | 461 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
462 | { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" }, | 462 | { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" }, |
463 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 463 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
464 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 464 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
465 | { "Date Format","Datums Format" }, | 465 | { "Date Format","Datums Format" }, |
466 | { "Timezone:","Zeitzone:" }, | 466 | { "Timezone:","Zeitzone:" }, |
467 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 467 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
468 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 468 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
469 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, | 469 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, |
470 | { "Used Mail Client","Benutzter Mail Client" }, | 470 | { "Used Mail Client","Benutzter Mail Client" }, |
471 | { "Channel:","Channel:" }, | 471 | { "Channel:","Channel:" }, |
472 | { "Message:","Message:" }, | 472 | { "Message:","Message:" }, |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 047df7c..b60ae7b 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -313,97 +313,97 @@ | |||
313 | { "Purge Todos","Todos bereinigen" }, | 313 | { "Purge Todos","Todos bereinigen" }, |
314 | { "read-only","schreibgeschützt" }, | 314 | { "read-only","schreibgeschützt" }, |
315 | { "Recur every","Wiederh. alle" }, | 315 | { "Recur every","Wiederh. alle" }, |
316 | { "Recur in the month of","Wiederh. im Monat" }, | 316 | { "Recur in the month of","Wiederh. im Monat" }, |
317 | { "Recur on the","Wiederh. am" }, | 317 | { "Recur on the","Wiederh. am" }, |
318 | { "Recur on this day","Wiederh. am diesen Tag" }, | 318 | { "Recur on this day","Wiederh. am diesen Tag" }, |
319 | { "Recurrence Range...","Wiederholungs Zeitraum..." }, | 319 | { "Recurrence Range...","Wiederholungs Zeitraum..." }, |
320 | { "Recurrence Range","Wiederholungs Zeitraum" }, | 320 | { "Recurrence Range","Wiederholungs Zeitraum" }, |
321 | { "Recurrence Rule","Wiederholungs Regel" }, | 321 | { "Recurrence Rule","Wiederholungs Regel" }, |
322 | { "Recurrence","Wiederholung" }, | 322 | { "Recurrence","Wiederholung" }, |
323 | { "Recurs","Wiederholung" }, | 323 | { "Recurs","Wiederholung" }, |
324 | {"&Reject","Abweisen"}, | 324 | {"&Reject","Abweisen"}, |
325 | { "Reminder:","Alarm:" }, | 325 | { "Reminder:","Alarm:" }, |
326 | { "Rem.:","Alarm:" }, | 326 | { "Rem.:","Alarm:" }, |
327 | { "Rem.","Alarm:" }, | 327 | { "Rem.","Alarm:" }, |
328 | { "Remote file:","Remote Datei:"}, | 328 | { "Remote file:","Remote Datei:"}, |
329 | { "Remote IP:","Remote (ferne) IP:" }, | 329 | { "Remote IP:","Remote (ferne) IP:" }, |
330 | { "Remote syncing (via ssh/scp) network settings ","Remote Sync (via ssh/scp) Netzwerk Einstellungen " }, | 330 | { "Remote syncing (via ssh/scp) network settings ","Remote Sync (via ssh/scp) Netzwerk Einstellungen " }, |
331 | { "Remote user:","Remote Benutzer"}, | 331 | { "Remote user:","Remote Benutzer"}, |
332 | { "&Remove","Entfe&rnen" }, | 332 | { "&Remove","Entfe&rnen" }, |
333 | { "Remove","Entfernen" }, | 333 | { "Remove","Entfernen" }, |
334 | { "Request response","Bemerkung anfordern" }, | 334 | { "Request response","Bemerkung anfordern" }, |
335 | { "Role:","Rolle:" }, | 335 | { "Role:","Rolle:" }, |
336 | { "Role","Rolle" }, | 336 | { "Role","Rolle" }, |
337 | { "Sat","Sa" }, | 337 | { "Sat","Sa" }, |
338 | { "Saturday","Samstag" }, | 338 | { "Saturday","Samstag" }, |
339 | { "Search for:","Suche nach:" }, | 339 | { "Search for:","Suche nach:" }, |
340 | { "Search In","Suche in" }, | 340 | { "Search In","Suche in" }, |
341 | { "Search...","Suche..." }, | 341 | { "Search...","Suche..." }, |
342 | { "Search","Suche" }, | 342 | { "Search","Suche" }, |
343 | { "Select Addresses","Wähle Adressen" }, | 343 | { "Select Addresses","Wähle Adressen" }, |
344 | { "Select all","Selektiere Alle" }, | 344 | { "Select all","Selektiere Alle" }, |
345 | { "Select a month","Wähle Monat" }, | 345 | { "Select a month","Wähle Monat" }, |
346 | { "Select a week","Wähle Woche" }, | 346 | { "Select a week","Wähle Woche" }, |
347 | { "Select a year","Wähle Jahr" }, | 347 | { "Select a year","Wähle Jahr" }, |
348 | { "Send directly","Sende direkt" }, | 348 | { "Send directly","Sende direkt" }, |
349 | { "&Send Messages","&Sende Nachrichten", }, | 349 | { "&Send Messages","&Sende Nachrichten", }, |
350 | { "Sep","Sep" }, | 350 | { "Sep","Sep" }, |
351 | { "September","September" }, | 351 | { "September","September" }, |
352 | { "Shopping","Einkaufen" }, | 352 | { "Shopping","Einkaufen" }, |
353 | { "Show Dates","Zeige Daten" }, | 353 | { "Show Dates","Zeige Daten" }, |
354 | { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, | 354 | { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, |
355 | { "Show Event...","Zeige Termin..." }, | 355 | { "Show Event...","Zeige Termin..." }, |
356 | { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." }, | 356 | { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." }, |
357 | { "Show Marcus Bains line","Zeige Marcus Bains Linie" }, | 357 | { "Show Marcus Bains line","Zeige Marcus Bains Linie" }, |
358 | { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, | 358 | { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, |
359 | { "Show time as:","Zeige Zeit als" }, | 359 | { "Show time as:","Zeige Zeit als" }, |
360 | { "Show Todo...","Zeige To-Do" }, | 360 | { "Show Todo...","Zeige To-Do" }, |
361 | { "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, | 361 | { "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, |
362 | { "&Show","Zeige" }, | 362 | { "&Show","Zeige" }, |
363 | { "Show...","Zeige..." }, | 363 | { "Show...","Zeige..." }, |
364 | { "Show","Zeige" }, | 364 | { "Show","Zeige" }, |
365 | { "Small","Klein" }, | 365 | { "Small","Klein" }, |
366 | { "Sorry","Entschuldigung" }, | 366 | { "Sorry","Entschuldigung" }, |
367 | {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, | 367 | {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, |
368 | { "Start:","Start:" }, | 368 | { "Start:","Start:" }, |
369 | { "Start Date","Start Datum" }, | 369 | { "Start Date","Start Datum" }, |
370 | { "Start date: %1","Start Datum: %1" }, | 370 | { "Start date: %1","Start Datum: %1" }, |
371 | { "Start Time","Start Zeit" }, | 371 | { "Start Time","Start Zeit" }, |
372 | { "Status:","Status:" }, | 372 | { "Status:","Status:" }, |
373 | { "Status","Status:" }, | 373 | { "Status","Status:" }, |
374 | { "Summaries","Titel" }, | 374 | { "Summaries","Titel" }, |
375 | { "Summary:","Titel:" }, | 375 | { "Summary:","Titel:" }, |
376 | { "Summary","Titel" }, | 376 | { "Summary","Titel" }, |
377 | { "Sunday","Sonntag" }, | 377 | { "Sunday","Sonntag" }, |
378 | { "Sun","So" }, | 378 | { "Sun","So" }, |
379 | { "Sync preferences:","Sync Einstellungen" }, | 379 | { "Sync preferences:","Sync Einstellungen" }, |
380 | { "Sync Prefs","Sync Einstellungen" }, | 380 | { "Sync Prefs","Sync Einstellungen" }, |
381 | { "Syncronize","Daten abgleich" }, | 381 | { "Syncronize","Daten abgleich" }, |
382 | { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, | 382 | { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, |
383 | { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, | 383 | { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, |
384 | { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, | 384 | { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, |
385 | { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, | 385 | { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, |
386 | { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, | 386 | { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, |
387 | { "Template...","Vorlage..." }, | 387 | { "Template...","Vorlage..." }, |
388 | { "This day","Dieser Tag" }, | 388 | { "This day","Dieser Tag" }, |
389 | { "This is an experimental feature. ","Dieses Feature ist experimentel" }, | 389 | { "This is an experimental feature. ","Dieses Feature ist experimentel" }, |
390 | { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, | 390 | { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, |
391 | { "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, | 391 | { "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, |
392 | { "Thu","Do" }, | 392 | { "Thu","Do" }, |
393 | { "Thursday","Donnerstag" }, | 393 | { "Thursday","Donnerstag" }, |
394 | { "Time associated","Mit Zeit" }, | 394 | { "Time associated","Mit Zeit" }, |
395 | { "Time bar:","Uhrzeit Zeile:" }, | 395 | { "Time bar:","Uhrzeit Zeile:" }, |
396 | { "Time && Date","Zeit und Datum" }, | 396 | { "Time && Date","Zeit und Datum" }, |
397 | { "Time Format","Zeit Format" }, | 397 | { "Time Format","Zeit Format" }, |
398 | { "Time Format(nr):","Zeit Format(Neustart!)" }, | 398 | { "Time Format(nr):","Zeit Format(Neustart!)" }, |
399 | { "Date Labels:","Datumsleiste:" }, | 399 | { "Date Labels:","Datumsleiste:" }, |
400 | { "Time: ","Zeit: " }, | 400 | { "Time: ","Zeit: " }, |
401 | { "Timezone:","Zeitzone:" }, | 401 | { "Timezone:","Zeitzone:" }, |
402 | { "To: ","Bis: " }, | 402 | { "To: ","Bis: " }, |
403 | { "To:","Bis:" }, | 403 | { "To:","Bis:" }, |
404 | { "Today: ","Heute: " }, | 404 | { "Today: ","Heute: " }, |
405 | { "Todo due today color:","Heute fällige To-Do's" }, | 405 | { "Todo due today color:","Heute fällige To-Do's" }, |
406 | { "To-do items:","To-Do items:" }, | 406 | { "To-do items:","To-Do items:" }, |
407 | { "Todo overdue color:","Überfällige To-Do's" }, | 407 | { "Todo overdue color:","Überfällige To-Do's" }, |
408 | { "Todo","Todo" }, | 408 | { "Todo","Todo" }, |
409 | { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, | 409 | { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, |
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 8a4dd3d..1b4652a 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp | |||
@@ -88,106 +88,106 @@ class ExtensionItem : public QCheckListItem | |||
88 | 88 | ||
89 | KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name ) | 89 | KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name ) |
90 | : KPrefsWidget( prefs, parent, name ) | 90 | : KPrefsWidget( prefs, parent, name ) |
91 | { | 91 | { |
92 | 92 | ||
93 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 93 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
94 | KDialog::spacingHintSmall() ); | 94 | KDialog::spacingHintSmall() ); |
95 | 95 | ||
96 | QTabWidget *tabWidget = new QTabWidget( this ); | 96 | QTabWidget *tabWidget = new QTabWidget( this ); |
97 | topLayout->addWidget( tabWidget ); | 97 | topLayout->addWidget( tabWidget ); |
98 | 98 | ||
99 | // General page | 99 | // General page |
100 | QWidget *generalPage = new QWidget( this ); | 100 | QWidget *generalPage = new QWidget( this ); |
101 | QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), | 101 | QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(), |
102 | KDialog::spacingHintSmall() ); | 102 | KDialog::spacingHintSmall() ); |
103 | 103 | ||
104 | 104 | ||
105 | QWidget *hBox = new QWidget( generalPage, "qhbox" ); | 105 | QWidget *hBox = new QWidget( generalPage, "qhbox" ); |
106 | QHBoxLayout *hboxLayout = new QHBoxLayout( hBox); | 106 | QHBoxLayout *hboxLayout = new QHBoxLayout( hBox); |
107 | KPrefsWidFont *detailsFont = | 107 | KPrefsWidFont *detailsFont = |
108 | addWidFont(i18n("phone:123"),i18n("Details view font"), | 108 | addWidFont(i18n("phone:123"),i18n("Details view font"), |
109 | &(KABPrefs::instance()->mDetailsFont),hBox); | 109 | &(KABPrefs::instance()->mDetailsFont),hBox); |
110 | hboxLayout->addWidget(detailsFont->label()); | 110 | hboxLayout->addWidget(detailsFont->label()); |
111 | hboxLayout->addWidget(detailsFont->preview()); | 111 | hboxLayout->addWidget(detailsFont->preview()); |
112 | hboxLayout->addWidget(detailsFont->button()); | 112 | hboxLayout->addWidget(detailsFont->button()); |
113 | hboxLayout->setMargin(KDialog::marginHintSmall() ); | 113 | hboxLayout->setMargin(KDialog::marginHintSmall() ); |
114 | hboxLayout->setSpacing(KDialog::spacingHintSmall()); | 114 | hboxLayout->setSpacing(KDialog::spacingHintSmall()); |
115 | //hBox->setBackgroundColor( black); | 115 | //hBox->setBackgroundColor( black); |
116 | layout->addWidget( hBox ); | 116 | layout->addWidget( hBox ); |
117 | 117 | ||
118 | //general groupbox | 118 | //general groupbox |
119 | QWidget *vBox = new QWidget( generalPage, "qvbox" ); | 119 | QWidget *vBox = new QWidget( generalPage, "qvbox" ); |
120 | QVBoxLayout *boxLayout = new QVBoxLayout( vBox ); | 120 | QVBoxLayout *boxLayout = new QVBoxLayout( vBox ); |
121 | boxLayout->setAlignment( Qt::AlignTop ); | 121 | boxLayout->setAlignment( Qt::AlignTop ); |
122 | boxLayout->setMargin(KDialog::marginHintSmall() ); | 122 | boxLayout->setMargin(KDialog::marginHintSmall() ); |
123 | boxLayout->setSpacing( KDialog::spacingHintSmall() ); | 123 | boxLayout->setSpacing( KDialog::spacingHintSmall() ); |
124 | mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" ); | 124 | mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" ); |
125 | boxLayout->addWidget( mMenuBarBox ); | 125 | boxLayout->addWidget( mMenuBarBox ); |
126 | mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" ); | 126 | mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" ); |
127 | boxLayout->addWidget( mSearchReturnBox ); | 127 | boxLayout->addWidget( mSearchReturnBox ); |
128 | mAutoSearchWithWildcardBox = new QCheckBox( i18n( "Search with '*' prefix (wildcard)" ), vBox, "mwildcard" ); | 128 | mAutoSearchWithWildcardBox = new QCheckBox( i18n( "Search with '*' prefix (wildcard)" ), vBox, "mwildcard" ); |
129 | boxLayout->addWidget( mAutoSearchWithWildcardBox); | 129 | boxLayout->addWidget( mAutoSearchWithWildcardBox); |
130 | mHideSearchOnSwitchBox = new QCheckBox( i18n( "Shrink searchfield in portrait view" ), vBox, "mswitch" ); | 130 | mHideSearchOnSwitchBox = new QCheckBox( i18n( "Shrink searchfield in portrait view" ), vBox, "mswitch" ); |
131 | boxLayout->addWidget( mHideSearchOnSwitchBox ); | 131 | boxLayout->addWidget( mHideSearchOnSwitchBox ); |
132 | 132 | ||
133 | #ifdef DESKTOP_VERSION | 133 | #ifdef DESKTOP_VERSION |
134 | mHideSearchOnSwitchBox->hide(); | 134 | mHideSearchOnSwitchBox->hide(); |
135 | #endif | 135 | #endif |
136 | mViewsSingleClickBox = new QCheckBox( i18n( "Honor KDE single click" ), vBox, "msingle" ); | 136 | mViewsSingleClickBox = new QCheckBox( i18n( "Show edit dialog on single click" ), vBox, "msingle" ); |
137 | boxLayout->addWidget( mViewsSingleClickBox ); | 137 | boxLayout->addWidget( mViewsSingleClickBox ); |
138 | 138 | ||
139 | mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new addressees" ), vBox, "mparse" ); | 139 | mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new contacts" ), vBox, "mparse" ); |
140 | boxLayout->addWidget( mNameParsing ); | 140 | boxLayout->addWidget( mNameParsing ); |
141 | 141 | ||
142 | mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" ); | 142 | mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" ); |
143 | boxLayout->addWidget( mMultipleViewsAtOnce ); | 143 | boxLayout->addWidget( mMultipleViewsAtOnce ); |
144 | 144 | ||
145 | mAskForQuit = new QCheckBox( i18n( "Ask for quit when closing Ka/Pi" ), vBox, "mquit" ); | 145 | mAskForQuit = new QCheckBox( i18n( "Show exit confirmation" ), vBox, "mquit" ); |
146 | boxLayout->addWidget( mAskForQuit ); | 146 | boxLayout->addWidget( mAskForQuit ); |
147 | 147 | ||
148 | layout->addWidget( vBox ); | 148 | layout->addWidget( vBox ); |
149 | 149 | ||
150 | tabWidget->addTab( generalPage, i18n( "General" ) ); | 150 | tabWidget->addTab( generalPage, i18n( "General" ) ); |
151 | 151 | ||
152 | // Extension page | 152 | // Extension page |
153 | QWidget *extensionPage = new QWidget( this ); | 153 | QWidget *extensionPage = new QWidget( this ); |
154 | QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(), | 154 | QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(), |
155 | KDialog::spacingHintSmall() ); | 155 | KDialog::spacingHintSmall() ); |
156 | 156 | ||
157 | //extensions groupbox | 157 | //extensions groupbox |
158 | 158 | ||
159 | QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage ); | 159 | QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage ); |
160 | boxLayout = new QVBoxLayout( groupBox->layout() ); | 160 | boxLayout = new QVBoxLayout( groupBox->layout() ); |
161 | boxLayout->setAlignment( Qt::AlignTop ); | 161 | boxLayout->setAlignment( Qt::AlignTop ); |
162 | boxLayout->setMargin(KDialog::marginHintSmall()); | 162 | boxLayout->setMargin(KDialog::marginHintSmall()); |
163 | boxLayout->setSpacing(KDialog::spacingHintSmall()); | 163 | boxLayout->setSpacing(KDialog::spacingHintSmall()); |
164 | groupBox->layout()->setMargin(1) ; | 164 | groupBox->layout()->setMargin(1) ; |
165 | groupBox->layout()->setSpacing(0); | 165 | groupBox->layout()->setSpacing(0); |
166 | mExtensionView = new KListView( groupBox ); | 166 | mExtensionView = new KListView( groupBox ); |
167 | mExtensionView->setAllColumnsShowFocus( true ); | 167 | mExtensionView->setAllColumnsShowFocus( true ); |
168 | mExtensionView->addColumn( i18n( "Name" ) ); | 168 | mExtensionView->addColumn( i18n( "Name" ) ); |
169 | mExtensionView->addColumn( i18n( "Description" ) ); | 169 | mExtensionView->addColumn( i18n( "Description" ) ); |
170 | //mExtensionView->setMaximumHeight(80); | 170 | //mExtensionView->setMaximumHeight(80); |
171 | 171 | ||
172 | boxLayout->addWidget( mExtensionView ); | 172 | boxLayout->addWidget( mExtensionView ); |
173 | 173 | ||
174 | mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox ); | 174 | mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox ); |
175 | mConfigureButton->setEnabled( false ); | 175 | mConfigureButton->setEnabled( false ); |
176 | boxLayout->addWidget( mConfigureButton ); | 176 | boxLayout->addWidget( mConfigureButton ); |
177 | 177 | ||
178 | extensionLayout->addWidget( groupBox ); | 178 | extensionLayout->addWidget( groupBox ); |
179 | 179 | ||
180 | connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 180 | connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
181 | connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 181 | connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
182 | connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 182 | connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
183 | connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 183 | connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
184 | connect( mAutoSearchWithWildcardBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 184 | connect( mAutoSearchWithWildcardBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
185 | connect( mHideSearchOnSwitchBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 185 | connect( mHideSearchOnSwitchBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
186 | connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 186 | connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
187 | connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); | 187 | connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) ); |
188 | connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ), | 188 | connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ), |
189 | SLOT( selectionChanged( QListViewItem* ) ) ); | 189 | SLOT( selectionChanged( QListViewItem* ) ) ); |
190 | connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ), | 190 | connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ), |
191 | SLOT( itemClicked( QListViewItem* ) ) ); | 191 | SLOT( itemClicked( QListViewItem* ) ) ); |
192 | connect( mConfigureButton, SIGNAL( clicked() ), | 192 | connect( mConfigureButton, SIGNAL( clicked() ), |
193 | SLOT( configureExtension() ) ); | 193 | SLOT( configureExtension() ) ); |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 93ff55e..c851ab5 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -625,134 +625,136 @@ void KOAgendaView::slotDaylabelClicked( int num ) | |||
625 | { | 625 | { |
626 | 626 | ||
627 | QDate firstDate = mSelectedDates.first(); | 627 | QDate firstDate = mSelectedDates.first(); |
628 | if ( num == -1 ) | 628 | if ( num == -1 ) |
629 | emit showDateView( 6, firstDate ); | 629 | emit showDateView( 6, firstDate ); |
630 | else if (num >= 0 ) { | 630 | else if (num >= 0 ) { |
631 | if ( mSelectedDates.count() == 1) | 631 | if ( mSelectedDates.count() == 1) |
632 | emit showDateView( 9, firstDate.addDays( num ) ); | 632 | emit showDateView( 9, firstDate.addDays( num ) ); |
633 | else | 633 | else |
634 | emit showDateView( 3, firstDate.addDays( num ) ); | 634 | emit showDateView( 3, firstDate.addDays( num ) ); |
635 | } | 635 | } |
636 | else | 636 | else |
637 | showDateView( 10, firstDate.addDays(1) ); | 637 | showDateView( 10, firstDate.addDays(1) ); |
638 | } | 638 | } |
639 | 639 | ||
640 | KOAgendaButton* KOAgendaView::getNewDaylabel() | 640 | KOAgendaButton* KOAgendaView::getNewDaylabel() |
641 | { | 641 | { |
642 | 642 | ||
643 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); | 643 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); |
644 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); | 644 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); |
645 | mDayLabelsList.append( dayLabel ); | 645 | mDayLabelsList.append( dayLabel ); |
646 | mLayoutDayLabels->addWidget(dayLabel); | 646 | mLayoutDayLabels->addWidget(dayLabel); |
647 | return dayLabel ; | 647 | return dayLabel ; |
648 | } | 648 | } |
649 | 649 | ||
650 | void KOAgendaView::createDayLabels() | 650 | void KOAgendaView::createDayLabels() |
651 | { | 651 | { |
652 | 652 | ||
653 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 653 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
654 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 654 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
655 | return; | 655 | return; |
656 | 656 | ||
657 | } | 657 | } |
658 | int newHight; | 658 | int newHight; |
659 | if ( !mSelectedDates.count()) | 659 | if ( !mSelectedDates.count()) |
660 | return; | 660 | return; |
661 | 661 | ||
662 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 662 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
663 | // It would remove some flickering and gain speed (since this is called by | 663 | // It would remove some flickering and gain speed (since this is called by |
664 | // each updateView() call) | 664 | // each updateView() call) |
665 | 665 | ||
666 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; | 666 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; |
667 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 667 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
668 | if ( maxWid < 20 ) | 668 | if ( maxWid < 20 ) |
669 | maxWid = 20; | 669 | maxWid = 20; |
670 | 670 | ||
671 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 671 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
672 | QFontMetrics fm ( dlf ); | 672 | QFontMetrics fm ( dlf ); |
673 | dlf.setBold( true ); | ||
673 | int selCount = mSelectedDates.count(); | 674 | int selCount = mSelectedDates.count(); |
674 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; | 675 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; |
675 | QString dayTest = "Mon 20"; | 676 | QString dayTest = "Mon 20"; |
676 | //QString dayTest = "Mon 20"; | 677 | //QString dayTest = "Mon 20"; |
677 | int wid = fm.width( dayTest ); | 678 | int wid = fm.width( dayTest ); |
678 | //maxWid -= ( selCount * 3 ); //working for QLabels | 679 | //maxWid -= ( selCount * 3 ); //working for QLabels |
679 | if ( QApplication::desktop()->width() <= 320 ) | 680 | if ( QApplication::desktop()->width() <= 320 ) |
680 | maxWid -= ( selCount * 3 ); //working for QPushButton | 681 | maxWid -= ( selCount * 3 ); //working for QPushButton |
681 | else | 682 | else |
682 | maxWid -= ( selCount * 3 ); //working for QPushButton | 683 | maxWid -= ( selCount * 4 ); //working for QPushButton |
683 | if ( maxWid < 0 ) | 684 | if ( maxWid < 0 ) |
684 | maxWid = 20; | 685 | maxWid = 20; |
685 | int needWid = wid * selCount; | 686 | int needWid = wid * selCount; |
686 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 687 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
687 | //if ( needWid > maxWid ) | 688 | //if ( needWid > maxWid ) |
688 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 689 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
689 | while ( needWid > maxWid ) { | 690 | while ( needWid > maxWid ) { |
690 | dayTest = dayTest.left( dayTest.length() - 1 ); | 691 | dayTest = dayTest.left( dayTest.length() - 1 ); |
691 | wid = fm.width( dayTest ); | 692 | wid = fm.width( dayTest ); |
692 | needWid = wid * selCount; | 693 | needWid = wid * selCount; |
693 | } | 694 | } |
694 | int maxLen = dayTest.length(); | 695 | int maxLen = dayTest.length(); |
695 | int fontPoint = dlf.pointSize(); | 696 | int fontPoint = dlf.pointSize(); |
696 | if ( maxLen < 2 ) { | 697 | if ( maxLen < 2 ) { |
697 | int fontPoint = dlf.pointSize(); | 698 | int fontPoint = dlf.pointSize(); |
698 | while ( fontPoint > 4 ) { | 699 | while ( fontPoint > 4 ) { |
699 | --fontPoint; | 700 | --fontPoint; |
700 | dlf.setPointSize( fontPoint ); | 701 | dlf.setPointSize( fontPoint ); |
701 | QFontMetrics f( dlf ); | 702 | QFontMetrics f( dlf ); |
702 | wid = f.width( "30" ); | 703 | wid = f.width( "30" ); |
703 | needWid = wid * selCount; | 704 | needWid = wid * selCount; |
704 | if ( needWid < maxWid ) | 705 | if ( needWid < maxWid ) |
705 | break; | 706 | break; |
706 | } | 707 | } |
707 | maxLen = 2; | 708 | maxLen = 2; |
708 | } | 709 | } |
709 | //qDebug("Max len %d ", dayTest.length() ); | 710 | //qDebug("Max len %d ", dayTest.length() ); |
710 | 711 | if ( !KOPrefs::instance()->mTimeLabelsFont.bold() ) | |
712 | dlf.setBold( false ); | ||
711 | QFontMetrics tempF( dlf ); | 713 | QFontMetrics tempF( dlf ); |
712 | newHight = tempF.height(); | 714 | newHight = tempF.height(); |
713 | mDayLabels->setFont( dlf ); | 715 | mDayLabels->setFont( dlf ); |
714 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 716 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
715 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 717 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
716 | //mLayoutDayLabels->addSpacing( 2 ); | 718 | //mLayoutDayLabels->addSpacing( 2 ); |
717 | // QFont lFont = dlf; | 719 | // QFont lFont = dlf; |
718 | bool appendLabels = false; | 720 | bool appendLabels = false; |
719 | KOAgendaButton *dayLabel; | 721 | KOAgendaButton *dayLabel; |
720 | dayLabel = mDayLabelsList.first(); | 722 | dayLabel = mDayLabelsList.first(); |
721 | if ( !dayLabel ) { | 723 | if ( !dayLabel ) { |
722 | appendLabels = true; | 724 | appendLabels = true; |
723 | dayLabel = getNewDaylabel(); | 725 | dayLabel = getNewDaylabel(); |
724 | } | 726 | } |
725 | dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); | 727 | dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); |
726 | dayLabel->setFont( dlf ); | 728 | dayLabel->setFont( dlf ); |
727 | dayLabel->setNum( -1 ); | 729 | dayLabel->setNum( -1 ); |
728 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 730 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
729 | 731 | ||
730 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 732 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
731 | dayLabel->show(); | 733 | dayLabel->show(); |
732 | DateList::ConstIterator dit; | 734 | DateList::ConstIterator dit; |
733 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | 735 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); |
734 | int counter = -1; | 736 | int counter = -1; |
735 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 737 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
736 | ++counter; | 738 | ++counter; |
737 | QDate date = *dit; | 739 | QDate date = *dit; |
738 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 740 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
739 | if ( ! appendLabels ) { | 741 | if ( ! appendLabels ) { |
740 | dayLabel = mDayLabelsList.next(); | 742 | dayLabel = mDayLabelsList.next(); |
741 | if ( !dayLabel ) | 743 | if ( !dayLabel ) |
742 | appendLabels = true; | 744 | appendLabels = true; |
743 | } | 745 | } |
744 | if ( appendLabels ) { | 746 | if ( appendLabels ) { |
745 | dayLabel = getNewDaylabel(); | 747 | dayLabel = getNewDaylabel(); |
746 | } | 748 | } |
747 | dayLabel->setMinimumWidth( 1 ); | 749 | dayLabel->setMinimumWidth( 1 ); |
748 | dayLabel->setMaximumWidth( 10240 ); | 750 | dayLabel->setMaximumWidth( 10240 ); |
749 | dayLabel->setFont( dlf ); | 751 | dayLabel->setFont( dlf ); |
750 | dayLabel->show(); | 752 | dayLabel->show(); |
751 | dayLabel->setAutoRepeat( false ); | 753 | dayLabel->setAutoRepeat( false ); |
752 | dayLabel->setNum( counter ); | 754 | dayLabel->setNum( counter ); |
753 | QString str; | 755 | QString str; |
754 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 756 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
755 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 757 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
756 | switch ( maxLen ) { | 758 | switch ( maxLen ) { |
757 | case 2: | 759 | case 2: |
758 | str = QString::number( date.day() ); | 760 | str = QString::number( date.day() ); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 35a56ca..7ba1392 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -229,97 +229,97 @@ void KOPrefsDialog::setupLocaleTab() | |||
229 | sb = | 229 | sb = |
230 | addWidBool(i18n("Quick load/save (w/o Unicode)"), | 230 | addWidBool(i18n("Quick load/save (w/o Unicode)"), |
231 | &(KOPrefs::instance()->mUseQuicksave),topFrame); | 231 | &(KOPrefs::instance()->mUseQuicksave),topFrame); |
232 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); | 232 | topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); |
233 | #endif | 233 | #endif |
234 | #endif | 234 | #endif |
235 | } | 235 | } |
236 | 236 | ||
237 | void KOPrefsDialog::setupMainTab() | 237 | void KOPrefsDialog::setupMainTab() |
238 | { | 238 | { |
239 | QFrame *topFrame = addPage(i18n("General"),0,0); | 239 | QFrame *topFrame = addPage(i18n("General"),0,0); |
240 | // DesktopIcon("identity",KIcon::SizeMedium)); | 240 | // DesktopIcon("identity",KIcon::SizeMedium)); |
241 | 241 | ||
242 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 242 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
243 | topLayout->setSpacing(mSpacingHint); | 243 | topLayout->setSpacing(mSpacingHint); |
244 | topLayout->setMargin(mMarginHint); | 244 | topLayout->setMargin(mMarginHint); |
245 | 245 | ||
246 | // KPrefsDialogWidBool *emailControlCenter = | 246 | // KPrefsDialogWidBool *emailControlCenter = |
247 | // addWidBool(i18n("&Use email settings from Control Center"), | 247 | // addWidBool(i18n("&Use email settings from Control Center"), |
248 | // &(KOPrefs::instance()->mEmailControlCenter),topFrame); | 248 | // &(KOPrefs::instance()->mEmailControlCenter),topFrame); |
249 | // topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); | 249 | // topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); |
250 | // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), | 250 | // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), |
251 | // SLOT(toggleEmailSettings(bool))); | 251 | // SLOT(toggleEmailSettings(bool))); |
252 | 252 | ||
253 | mNameEdit = new QLineEdit(topFrame); | 253 | mNameEdit = new QLineEdit(topFrame); |
254 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); | 254 | mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); |
255 | topLayout->addWidget(mNameLabel,0,0); | 255 | topLayout->addWidget(mNameLabel,0,0); |
256 | topLayout->addWidget(mNameEdit,0,1); | 256 | topLayout->addWidget(mNameEdit,0,1); |
257 | 257 | ||
258 | mEmailEdit = new QLineEdit(topFrame); | 258 | mEmailEdit = new QLineEdit(topFrame); |
259 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); | 259 | mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); |
260 | topLayout->addWidget(mEmailLabel,1,0); | 260 | topLayout->addWidget(mEmailLabel,1,0); |
261 | topLayout->addWidget(mEmailEdit,1,1); | 261 | topLayout->addWidget(mEmailEdit,1,1); |
262 | KPrefsDialogWidBool *wb; | 262 | KPrefsDialogWidBool *wb; |
263 | 263 | ||
264 | 264 | ||
265 | 265 | ||
266 | KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"), | 266 | KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"), |
267 | &(KOPrefs::instance()->mShowFullMenu),topFrame); | 267 | &(KOPrefs::instance()->mShowFullMenu),topFrame); |
268 | topLayout->addMultiCellWidget( widbool->checkBox(), 2,2,0,1); | 268 | topLayout->addMultiCellWidget( widbool->checkBox(), 2,2,0,1); |
269 | 269 | ||
270 | 270 | ||
271 | widbool = addWidBool(i18n("Mini icons in toolbar(nr)"), | 271 | widbool = addWidBool(i18n("Mini icons in toolbar(nr)"), |
272 | &(KOPrefs::instance()->mToolBarMiniIcons),topFrame); | 272 | &(KOPrefs::instance()->mToolBarMiniIcons),topFrame); |
273 | topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1); | 273 | topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1); |
274 | 274 | ||
275 | 275 | ||
276 | KPrefsDialogWidBool *verticalScreen = | 276 | KPrefsDialogWidBool *verticalScreen = |
277 | addWidBool(i18n("Show vertical screen (Needs restart)"), | 277 | addWidBool(i18n("Vertical screen layout(Needs restart)"), |
278 | &(KOPrefs::instance()->mVerticalScreen),topFrame); | 278 | &(KOPrefs::instance()->mVerticalScreen),topFrame); |
279 | //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); | 279 | //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); |
280 | topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); | 280 | topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); |
281 | 281 | ||
282 | 282 | ||
283 | int iii = 5; | 283 | int iii = 5; |
284 | widbool = addWidBool(i18n("Block popup until mouse button release"), | 284 | widbool = addWidBool(i18n("Block popup until mouse button release"), |
285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); | 285 | &(KOPrefs::instance()->mBlockPopupMenu),topFrame); |
286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); | 286 | topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1); |
287 | ++iii; | 287 | ++iii; |
288 | if ( QApplication::desktop()->height() <= 240 ) { | 288 | if ( QApplication::desktop()->height() <= 240 ) { |
289 | topFrame = addPage(i18n("General") +" 2",0,0); | 289 | topFrame = addPage(i18n("General") +" 2",0,0); |
290 | topLayout = new QGridLayout(topFrame,4,2); | 290 | topLayout = new QGridLayout(topFrame,4,2); |
291 | topLayout->setSpacing(2); | 291 | topLayout->setSpacing(2); |
292 | topLayout->setMargin(3); | 292 | topLayout->setMargin(3); |
293 | iii = 0; | 293 | iii = 0; |
294 | } | 294 | } |
295 | QHBox *dummy = new QHBox(topFrame); | 295 | QHBox *dummy = new QHBox(topFrame); |
296 | new QLabel(i18n("Days in Next-X-Days:"),dummy); | 296 | new QLabel(i18n("Days in Next-X-Days:"),dummy); |
297 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); | 297 | mNextXDaysSpin = new QSpinBox(2,14,1,dummy); |
298 | 298 | ||
299 | topLayout->addMultiCellWidget(dummy,iii,iii,0,1); | 299 | topLayout->addMultiCellWidget(dummy,iii,iii,0,1); |
300 | 300 | ||
301 | ++iii; | 301 | ++iii; |
302 | 302 | ||
303 | 303 | ||
304 | // KPrefsDialogWidBool *bcc = | 304 | // KPrefsDialogWidBool *bcc = |
305 | // addWidBool(i18n("Send copy to owner when mailing events"), | 305 | // addWidBool(i18n("Send copy to owner when mailing events"), |
306 | // &(KOPrefs::instance()->mBcc),topFrame); | 306 | // &(KOPrefs::instance()->mBcc),topFrame); |
307 | // topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); | 307 | // topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); |
308 | 308 | ||
309 | 309 | ||
310 | // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); | 310 | // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); |
311 | //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); | 311 | //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); |
312 | 312 | ||
313 | // addWidBool(i18n("Enable automatic saving of calendar"), | 313 | // addWidBool(i18n("Enable automatic saving of calendar"), |
314 | // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); | 314 | // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); |
315 | 315 | ||
316 | QHBox *intervalBox = new QHBox(topFrame); | 316 | QHBox *intervalBox = new QHBox(topFrame); |
317 | // intervalBox->setSpacing(mSpacingHint); | 317 | // intervalBox->setSpacing(mSpacingHint); |
318 | topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1); | 318 | topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1); |
319 | ++iii; | 319 | ++iii; |
320 | QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); | 320 | QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); |
321 | mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); | 321 | mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); |
322 | autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); | 322 | autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); |
323 | /* | 323 | /* |
324 | QHBox * agendasize = new QHBox ( topFrame ); | 324 | QHBox * agendasize = new QHBox ( topFrame ); |
325 | 325 | ||