| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 10 | ||||
| -rw-r--r-- | kaddressbook/views/contactlistview.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/xxportselectdialog.cpp | 8 | ||||
| -rw-r--r-- | korganizer/calendarview.cpp | 14 | ||||
| -rw-r--r-- | korganizer/koeditordetails.cpp | 7 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 5 |
6 files changed, 36 insertions, 10 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index b5ad650..08efcf6 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -544,4 +544,14 @@ { "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
{ "A&dd","Hinzufügen" },
+{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
+{ "NOTE: This will remove all old\ncontact data on phone!","ACHTUNG: Das löscht alle alten\nKontakt Daten auf dem Handy!" },
+{ "Export to mobile phone!","Exportiere auf das Handy!" },
+{ "Export to phone options","Export ans Handy Optionen" },
+{ "Writing to phone...","Sende Daten ans Handy..." },
+{ " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
+{ "Retry","Nochmal versuchen" },
+{ "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
+{ "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
+{ "Error exporting to phone!","Fehler beim Export auf das Handy!" },
{ "","" },
{ "","" },
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index ad43970..23b091c 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -190,5 +190,5 @@ QString ContactListViewItem::key(int column, bool ascending) const ret.at(start-1) = 's'; } - qDebug("conv string %s ", ret.latin1()); + //qDebug("conv string %s ", ret.latin1()); return ret; diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index ab95d5f..6282453 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -36,4 +36,5 @@ $Id$ #include <kglobal.h> +#include <qapplication.h> #include <qbuttongroup.h> #include <qcombobox.h> @@ -246,4 +247,6 @@ void XXPortSelectDialog::initGUI() groupLayout->addWidget( mCategoriesView, 3, 1 ); + // if (QApplication::desktop()->height() == 480 ) + // mCategoriesView->setMaximumHeight( 240 ); topLayout->addWidget( mButtonGroup ); @@ -279,5 +282,8 @@ void XXPortSelectDialog::initGUI() if ( !mUseSorting ) - sortingGroup->hide(); + sortingGroup->hide(); +#ifndef DESKTOP_VERSION + hideButtons(); +#endif } diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 47cd488..543897a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2451,6 +2451,9 @@ void CalendarView::showEventEditor() mEventEditor->show(); #else - if ( mEventEditor->width() != QApplication::desktop()->width() ) - mEventEditor->hide(); + if ( mEventEditor->width() != QApplication::desktop()->width() ) { + qDebug("CalendarView: recreate mEventEditor "); + delete mEventEditor; + mEventEditor = mDialogManager->getEventEditor(); + } mEventEditor->showMaximized(); #endif @@ -2461,6 +2464,9 @@ void CalendarView::showTodoEditor() mTodoEditor->show(); #else - if ( mTodoEditor->width() != QApplication::desktop()->width() ) - mTodoEditor->hide(); + if ( mTodoEditor->width() != QApplication::desktop()->width() ) { + qDebug("CalendarView: recreate mTodoEditor "); + delete mTodoEditor; + mTodoEditor = mDialogManager->getTodoEditor(); + } mTodoEditor->showMaximized(); #endif diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 66f6977..b73d22f 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -143,5 +143,6 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); - if (qApp->desktop()->width() < 300 ) { + if (qApp->desktop()->width() < 640 ) { + if ( qApp->desktop()->width() < 300 ) mListView->setFixedHeight(80); topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); @@ -152,7 +153,7 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); topLayout->addWidget(attendeeRoleLabel,5,0); - topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); + topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); topLayout->addWidget(statusLabel,6,0); - topLayout->addMultiCellWidget(mStatusCombo,6,6,1,2); + topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 65566b5..46ae6a0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -114,5 +114,8 @@ class KOex2phonePrefs : public QDialog connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); resize( 220, 240 ); - + qApp->processEvents(); + int dw = QApplication::desktop()->width(); + int dh = QApplication::desktop()->height(); + move( (dw-width())/2, (dh - height() )/2 ); } |