From 196365e533c6fd1a8f47aa9579763ef5afcebcda Mon Sep 17 00:00:00 2001 From: zautrix Date: Sun, 05 Dec 2004 11:14:32 +0000 Subject: layout bugfixes --- 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 @@ -543,6 +543,16 @@ { "Remove from addressees","Entferne von den Kontakten" }, { "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 @@ -189,7 +189,7 @@ QString ContactListViewItem::key(int column, bool ascending) const while ( (start = ret.find( 'ß', start+1)) > 0 ) { 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 @@ -35,6 +35,7 @@ $Id$ #include #include +#include #include #include #include @@ -245,6 +246,8 @@ void XXPortSelectDialog::initGUI() QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) ); groupLayout->addWidget( mCategoriesView, 3, 1 ); + // if (QApplication::desktop()->height() == 480 ) + // mCategoriesView->setMaximumHeight( 240 ); topLayout->addWidget( mButtonGroup ); QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page ); @@ -278,7 +281,10 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( sortingGroup ); if ( !mUseSorting ) - sortingGroup->hide(); + sortingGroup->hide(); +#ifndef DESKTOP_VERSION + hideButtons(); +#endif } #ifndef KAB_EMBEDDED diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 47cd488..543897a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2450,8 +2450,11 @@ void CalendarView::showEventEditor() #ifdef DESKTOP_VERSION 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 } @@ -2460,8 +2463,11 @@ void CalendarView::showTodoEditor() #ifdef DESKTOP_VERSION 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 @@ -142,7 +142,8 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); //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); topLayout->addMultiCellWidget(mListView,1,1,0,3); @@ -151,9 +152,9 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) topLayout->addWidget(emailLabel,4,0); 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); topLayout->addMultiCellWidget(buttonBox,3,4,3,3); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 65566b5..46ae6a0 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -113,7 +113,10 @@ class KOex2phonePrefs : public QDialog connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 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 ); } public: -- cgit v0.9.0.2