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 /kaddressbook | |
parent | e4e75984b6cb581d87d436cb6c5140eb57dbdc51 (diff) | |
download | kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.zip kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.tar.gz kdepimpi-196365e533c6fd1a8f47aa9579763ef5afcebcda.tar.bz2 |
layout bugfixes
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxportselectdialog.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
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 | |||
@@ -186,13 +186,13 @@ QString ContactListViewItem::key(int column, bool ascending) const | |||
186 | ret.at(start-1) = 'o'; | 186 | ret.at(start-1) = 'o'; |
187 | } | 187 | } |
188 | start = -1; | 188 | start = -1; |
189 | while ( (start = ret.find( 'ß', start+1)) > 0 ) { | 189 | while ( (start = ret.find( 'ß', start+1)) > 0 ) { |
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; |
195 | 195 | ||
196 | } | 196 | } |
197 | else | 197 | else |
198 | #endif | 198 | #endif |
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index ab95d5f..6282453 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp | |||
@@ -32,12 +32,13 @@ $Id$ | |||
32 | #include <kabc/addressbook.h> | 32 | #include <kabc/addressbook.h> |
33 | #include <kapplication.h> | 33 | #include <kapplication.h> |
34 | #include <kcombobox.h> | 34 | #include <kcombobox.h> |
35 | #include <klocale.h> | 35 | #include <klocale.h> |
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> |
40 | #include <qheader.h> | 41 | #include <qheader.h> |
41 | #include <qlabel.h> | 42 | #include <qlabel.h> |
42 | #include <qlayout.h> | 43 | #include <qlayout.h> |
43 | #include <qlistview.h> | 44 | #include <qlistview.h> |
@@ -242,12 +243,14 @@ void XXPortSelectDialog::initGUI() | |||
242 | mCategoriesView = new QListView( mButtonGroup ); | 243 | mCategoriesView = new QListView( mButtonGroup ); |
243 | mCategoriesView->addColumn( "" ); | 244 | mCategoriesView->addColumn( "" ); |
244 | mCategoriesView->header()->hide(); | 245 | mCategoriesView->header()->hide(); |
245 | QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) ); | 246 | QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) ); |
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 | ||
250 | QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page ); | 253 | QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page ); |
251 | sortingGroup->setColumnLayout( 0, Qt::Vertical ); | 254 | sortingGroup->setColumnLayout( 0, Qt::Vertical ); |
252 | QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2, | 255 | QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2, |
253 | KDialog::spacingHint() ); | 256 | KDialog::spacingHint() ); |
@@ -275,13 +278,16 @@ void XXPortSelectDialog::initGUI() | |||
275 | #endif //KAB_EMBEDDED | 278 | #endif //KAB_EMBEDDED |
276 | sortLayout->addWidget( mSortTypeCombo, 1, 1 ); | 279 | sortLayout->addWidget( mSortTypeCombo, 1, 1 ); |
277 | 280 | ||
278 | topLayout->addWidget( sortingGroup ); | 281 | topLayout->addWidget( sortingGroup ); |
279 | 282 | ||
280 | if ( !mUseSorting ) | 283 | if ( !mUseSorting ) |
281 | sortingGroup->hide(); | 284 | sortingGroup->hide(); |
285 | #ifndef DESKTOP_VERSION | ||
286 | hideButtons(); | ||
287 | #endif | ||
282 | } | 288 | } |
283 | 289 | ||
284 | #ifndef KAB_EMBEDDED | 290 | #ifndef KAB_EMBEDDED |
285 | #include "xxportselectdialog.moc" | 291 | #include "xxportselectdialog.moc" |
286 | #endif //KAB_EMBEDDED | 292 | #endif //KAB_EMBEDDED |
287 | 293 | ||