author | zautrix <zautrix> | 2004-12-05 11:14:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-05 11:14:32 (UTC) |
commit | 196365e533c6fd1a8f47aa9579763ef5afcebcda (patch) (unidiff) | |
tree | 3784f0be50b790d9386db1e4ebd29d44317db026 | |
parent | e4e75984b6cb581d87d436cb6c5140eb57dbdc51 (diff) | |
download | kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.zip kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.tar.gz kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.tar.bz2 |
layout bugfixes
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 10 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxportselectdialog.cpp | 6 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 14 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 7 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 5 |
6 files changed, 35 insertions, 9 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 @@ | |||
544 | { "New categories not in list:","Kategorien, die nicht in der Liste sind:" }, | 544 | { "New categories not in list:","Kategorien, die nicht in der Liste sind:" }, |
545 | { "A&dd","Hinzufügen" }, | 545 | { "A&dd","Hinzufügen" }, |
546 | { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, | ||
547 | { "NOTE: This will remove all old\ncontact data on phone!","ACHTUNG: Das löscht alle alten\nKontakt Daten auf dem Handy!" }, | ||
548 | { "Export to mobile phone!","Exportiere auf das Handy!" }, | ||
549 | { "Export to phone options","Export ans Handy Optionen" }, | ||
550 | { "Writing to phone...","Sende Daten ans Handy..." }, | ||
551 | { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, | ||
552 | { "Retry","Nochmal versuchen" }, | ||
553 | { "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, | ||
554 | { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" }, | ||
555 | { "Error exporting to phone!","Fehler beim Export auf das Handy!" }, | ||
546 | { "","" }, | 556 | { "","" }, |
547 | { "","" }, | 557 | { "","" }, |
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 | |||
190 | ret.at(start-1) = 's'; | 190 | ret.at(start-1) = 's'; |
191 | } | 191 | } |
192 | qDebug("conv string %s ", ret.latin1()); | 192 | //qDebug("conv string %s ", ret.latin1()); |
193 | 193 | ||
194 | return ret; | 194 | 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$ | |||
36 | #include <kglobal.h> | 36 | #include <kglobal.h> |
37 | 37 | ||
38 | #include <qapplication.h> | ||
38 | #include <qbuttongroup.h> | 39 | #include <qbuttongroup.h> |
39 | #include <qcombobox.h> | 40 | #include <qcombobox.h> |
@@ -246,4 +247,6 @@ void XXPortSelectDialog::initGUI() | |||
246 | groupLayout->addWidget( mCategoriesView, 3, 1 ); | 247 | groupLayout->addWidget( mCategoriesView, 3, 1 ); |
247 | 248 | ||
249 | // if (QApplication::desktop()->height() == 480 ) | ||
250 | // mCategoriesView->setMaximumHeight( 240 ); | ||
248 | topLayout->addWidget( mButtonGroup ); | 251 | topLayout->addWidget( mButtonGroup ); |
249 | 252 | ||
@@ -280,4 +283,7 @@ void XXPortSelectDialog::initGUI() | |||
280 | if ( !mUseSorting ) | 283 | if ( !mUseSorting ) |
281 | sortingGroup->hide(); | 284 | sortingGroup->hide(); |
285 | #ifndef DESKTOP_VERSION | ||
286 | hideButtons(); | ||
287 | #endif | ||
282 | } | 288 | } |
283 | 289 | ||
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() | |||
2451 | mEventEditor->show(); | 2451 | mEventEditor->show(); |
2452 | #else | 2452 | #else |
2453 | if ( mEventEditor->width() != QApplication::desktop()->width() ) | 2453 | if ( mEventEditor->width() != QApplication::desktop()->width() ) { |
2454 | mEventEditor->hide(); | 2454 | qDebug("CalendarView: recreate mEventEditor "); |
2455 | delete mEventEditor; | ||
2456 | mEventEditor = mDialogManager->getEventEditor(); | ||
2457 | } | ||
2455 | mEventEditor->showMaximized(); | 2458 | mEventEditor->showMaximized(); |
2456 | #endif | 2459 | #endif |
@@ -2461,6 +2464,9 @@ void CalendarView::showTodoEditor() | |||
2461 | mTodoEditor->show(); | 2464 | mTodoEditor->show(); |
2462 | #else | 2465 | #else |
2463 | if ( mTodoEditor->width() != QApplication::desktop()->width() ) | 2466 | if ( mTodoEditor->width() != QApplication::desktop()->width() ) { |
2464 | mTodoEditor->hide(); | 2467 | qDebug("CalendarView: recreate mTodoEditor "); |
2468 | delete mTodoEditor; | ||
2469 | mTodoEditor = mDialogManager->getTodoEditor(); | ||
2470 | } | ||
2465 | mTodoEditor->showMaximized(); | 2471 | mTodoEditor->showMaximized(); |
2466 | #endif | 2472 | #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) | |||
143 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); | 143 | //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); |
144 | 144 | ||
145 | if (qApp->desktop()->width() < 300 ) { | 145 | if (qApp->desktop()->width() < 640 ) { |
146 | if ( qApp->desktop()->width() < 300 ) | ||
146 | mListView->setFixedHeight(80); | 147 | mListView->setFixedHeight(80); |
147 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); | 148 | topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); |
@@ -152,7 +153,7 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | |||
152 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); | 153 | topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); |
153 | topLayout->addWidget(attendeeRoleLabel,5,0); | 154 | topLayout->addWidget(attendeeRoleLabel,5,0); |
154 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); | 155 | topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); |
155 | topLayout->addWidget(statusLabel,6,0); | 156 | topLayout->addWidget(statusLabel,6,0); |
156 | topLayout->addMultiCellWidget(mStatusCombo,6,6,1,2); | 157 | topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); |
157 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); | 158 | topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); |
158 | topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); | 159 | 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 | |||
114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 114 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
115 | resize( 220, 240 ); | 115 | resize( 220, 240 ); |
116 | 116 | qApp->processEvents(); | |
117 | int dw = QApplication::desktop()->width(); | ||
118 | int dh = QApplication::desktop()->height(); | ||
119 | move( (dw-width())/2, (dh - height() )/2 ); | ||
117 | } | 120 | } |
118 | 121 | ||