layout bugfixes

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
@@ -538,15 +538,25 @@
 { "&Modify","Ändere" },

 { "Choose which contacts to select","Bitte Kontakte auswählen!" },

 { "After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nKontakten geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },

 { "Manage new Categories","Verwalte neue Kategorien" },

 { "Add to category list","Füge zur Kategorieliste hinzu" },

 { "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!" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },
\ No newline at end of file
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
@@ -184,17 +184,17 @@ QString ContactListViewItem::key(int column, bool ascending) const
         start = -1;
         while ( (start = ret.find( 'ü', start+1)) > 0 ) {
             ret.at(start-1) = 'o';
         }
         start = -1;
         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;
         
     }
     else
 #endif
         return QListViewItem::key(column, ascending).lower();
 }
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index ab95d5f..6282453 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -30,16 +30,17 @@ $Id$
 */
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kglobal.h>
 
+#include <qapplication.h>
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
@@ -240,16 +241,18 @@ void XXPortSelectDialog::initGUI()
   groupLayout->addWidget( mFiltersCombo, 2, 1 );
 
   mCategoriesView = new QListView( mButtonGroup );
   mCategoriesView->addColumn( "" );
   mCategoriesView->header()->hide();
   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 );
   sortingGroup->setColumnLayout( 0, Qt::Vertical );
   QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2,
                                              KDialog::spacingHint() );
   sortLayout->setAlignment( Qt::AlignTop );
 
@@ -273,16 +276,19 @@ void XXPortSelectDialog::initGUI()
   //US Combobox is not editable anyway
   mSortTypeCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
   sortLayout->addWidget( mSortTypeCombo, 1, 1 );
 
   topLayout->addWidget( sortingGroup );
 
   if ( !mUseSorting )
-    sortingGroup->hide();
+    sortingGroup->hide(); 
+#ifndef DESKTOP_VERSION
+  hideButtons();
+#endif
 }
 
 #ifndef KAB_EMBEDDED
 #include "xxportselectdialog.moc"
 #endif //KAB_EMBEDDED
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 47cd488..543897a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2445,28 +2445,34 @@ void CalendarView::showDatePicker( )
     mDatePicker->setDate( mNavigator->selectedDates().first() );
 }
 
 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
 }
 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
 }
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 66f6977..b73d22f 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -137,28 +137,29 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   buttonLayout->addWidget(mRemoveButton);
   connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
 
   mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
   // buttonLayout->addWidget(mAddressBookButton);
   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);
       topLayout->addWidget(attendeeLabel,3,0);
       topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
       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);
       topLayout->setRowStretch(1,2);
       topLayout->setColStretch(0,0);
       topLayout->setColStretch(1,2);
       topLayout->setColStretch(2,1);
       topLayout->setColStretch(3,1);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 65566b5..46ae6a0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -108,17 +108,20 @@ class KOex2phonePrefs : public QDialog
         lab->setAlignment (AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         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:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };