summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-31 11:26:51 (UTC)
committer zautrix <zautrix>2005-03-31 11:26:51 (UTC)
commitc0fa26aa3b33c293853bdd7d028ddb0545e33c85 (patch) (side-by-side diff)
tree12bbb65fb6d235415bd7a7007c1e019ccfcf97ac
parentf39d5000ed2f9a436ee94cbd42f840651afa89d6 (diff)
downloadkdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.zip
kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.gz
kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.bz2
many fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt16
-rw-r--r--kabc/phonenumber.cpp34
-rw-r--r--kaddressbook/emaileditwidget.cpp2
-rw-r--r--kaddressbook/phoneeditwidget.cpp37
-rw-r--r--korganizer/mainwindow.cpp22
5 files changed, 73 insertions, 38 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 1a045f3..f8f8b96 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1022,5 +1022,5 @@
{ "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
{ "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
-{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datumsnavigator</p>\n" },
+{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X+ctrl</b>: Zeige/verstecke Datumsnavigator</p>\n" },
{ "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
{ "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
@@ -1028,5 +1028,5 @@
{ "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
{ "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
-{ "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
+{ "<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ","<p><b>X</b>: Nächste-X-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
{ "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
{ "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
@@ -1327,4 +1327,16 @@
{ "Printout Mode","Druck Modus" },
{ "Filter menu icon","Filtermenu Icon" },
+{ "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" },
+{ "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index abb3b3b..041effc 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -185,15 +185,15 @@ QString PhoneNumber::typeLabel( int type )
if (!typeString.isEmpty())
typeString += " ";
-
if ((type & Cell) == Cell)
- typeString += i18n("Mobile");
- else if ((type & Fax) == Fax)
+ typeString += i18n("Mobile") +" ";
+ if ((type & Sip) == Sip)
+ typeString += i18n("SIP")+" ";
+ if ((type & Car) == Car)
+ typeString += i18n("Car")+" ";
+
+ if ((type & Fax) == Fax)
typeString += i18n("Fax");
else if ((type & Msg) == Msg)
typeString += i18n("Messenger");
- else if ((type & Voice) == Voice) {
-// add nothing in case of the Voice flag
-// typeString += i18n("Voice");
- }
else if ((type & Video) == Video)
typeString += i18n("Video");
@@ -202,6 +202,4 @@ QString PhoneNumber::typeLabel( int type )
else if ((type & Modem) == Modem)
typeString += i18n("Modem");
- else if ((type & Car) == Car)
- typeString += i18n("Car");
else if ((type & Isdn) == Isdn)
typeString += i18n("ISDN");
@@ -210,10 +208,5 @@ QString PhoneNumber::typeLabel( int type )
else if ((type & Pager) == Pager)
typeString += i18n("Pager");
- else if ((type & Sip) == Sip)
- typeString += i18n("SIP");
-
// add the prefered flag
- if (!typeString.isEmpty())
- typeString += " ";
/*
if ((type & Pref) == Pref)
@@ -221,9 +214,12 @@ QString PhoneNumber::typeLabel( int type )
*/
//if we still have no match, return "other"
- if (typeString.isEmpty())
- return i18n("Other");
-
-
- return typeString;
+ if (typeString.isEmpty()) {
+ if ((type & Voice) == Voice)
+ return i18n("Voice");
+ else
+ return i18n("Other");
+ }
+
+ return typeString.stripWhiteSpace();
}
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 0e01b02..e72face 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -190,4 +190,5 @@ qDebug("EmailEditDialog::EmailEditDialog has to be changed (lowPrio)");
// set default state
selectionChanged( -1 );
+ mEmailEdit->setFocus();
#ifndef KAB_EMBEDDED
@@ -226,4 +227,5 @@ void EmailEditDialog::edit()
{
mEmailEdit->setText( mEmailListBox->currentText() );
+ mEmailListBox->removeItem( mEmailListBox->currentItem() );
mEmailEdit->setFocus();
}
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 19bb676..a435959 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -214,5 +214,6 @@ void PhoneEditWidget::edit()
if ( dlg.exec() ) {
if ( dlg.changed() ) {
- mPhoneList = dlg.phoneNumbers();
+ KABC::PhoneNumber::List list = dlg.phoneNumbers();
+ setPhoneNumbers( list );
updateCombos();
updateLineEdits();
@@ -339,5 +340,8 @@ private:
PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
: QListViewItem( parent ), mPhoneNumber( number )
-{
+{
+#ifdef DESKTOP_VERSION
+ setRenameEnabled ( 0, true );
+#endif
makeText();
}
@@ -407,9 +411,26 @@ void PhoneEditDialog::slotAddPhoneNumber()
if ( dlg.exec() ) {
- KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
- mPhoneNumberList.append( phoneNumber );
- new PhoneViewItem( mListView, phoneNumber );
-
- mChanged = true;
+ QListViewItem* i = mListView->firstChild();
+ KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
+ bool insert = true;
+ while ( i ) {
+ PhoneViewItem* p = ( PhoneViewItem* ) i;
+ KABC::PhoneNumber pn = p->phoneNumber();
+ if ( (pn.type() | KABC::PhoneNumber::Pref) == (phoneNumber.type() | KABC::PhoneNumber::Pref) ) {
+ if ( p->text(0).isEmpty()) {
+ p->setPhoneNumber( phoneNumber );
+ mPhoneNumberList.remove( pn );
+ mPhoneNumberList.append( phoneNumber );
+ insert = false;
+ break;
+ }
+ }
+ i = i->nextSibling();
+ }
+ if ( insert ) {
+ mPhoneNumberList.append( phoneNumber );
+ new PhoneViewItem( mListView, phoneNumber );
+ }
+ mChanged = true;
}
}
@@ -505,4 +526,6 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
+ mNumber->setFocus();
+ mNumber->setSelection( 0, 1024);
}
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 09a0880..d98915b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1440,4 +1440,6 @@ void MainWindow::keyBindings()
QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
+ i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
+ i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") +
i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
@@ -1445,5 +1447,5 @@ void MainWindow::keyBindings()
i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
- i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
+ i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
@@ -1452,5 +1454,5 @@ void MainWindow::keyBindings()
i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
- i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
+ i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+
i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
@@ -1901,10 +1903,5 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
break;
case Qt::Key_N:
- if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
- mView->viewManager()->showNextView();
- else {
- mView->viewManager()->showNextXView();
- showSelectedDates = true;
- }
+ mView->viewManager()->showNextView();
break;
case Qt::Key_V:
@@ -1923,6 +1920,11 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
mView->toggleFilter();
break;
- case Qt::Key_X:
- mView->toggleDateNavigatorWidget();
+ case Qt::Key_X:
+ if ( e->state() == Qt::ControlButton )
+ mView->toggleDateNavigatorWidget();
+ else {
+ mView->viewManager()->showNextXView();
+ showSelectedDates = true;
+ }
break;
case Qt::Key_Space: