-rw-r--r-- | kaddressbook/viewconfigurefieldspage.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 2c827eb..5daae1a 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <klocale.h> | 35 | #include <klocale.h> |
36 | 36 | ||
37 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
38 | #include <qapplication.h> | ||
38 | #include <qlabel.h> | 39 | #include <qlabel.h> |
39 | #include <qlistbox.h> | 40 | #include <qlistbox.h> |
40 | #include <qlayout.h> | 41 | #include <qlayout.h> |
@@ -219,7 +220,6 @@ void ViewConfigureFieldsPage::initGUI() | |||
219 | setCaption( i18n("Select Fields to Display") ); | 220 | setCaption( i18n("Select Fields to Display") ); |
220 | 221 | ||
221 | QGridLayout *gl = 0; | 222 | QGridLayout *gl = 0; |
222 | |||
223 | if (orientation == 0) | 223 | if (orientation == 0) |
224 | gl = new QGridLayout( this , 6, 4, 0, KDialog::spacingHint() ); | 224 | gl = new QGridLayout( this , 6, 4, 0, KDialog::spacingHint() ); |
225 | else | 225 | else |
@@ -230,7 +230,8 @@ void ViewConfigureFieldsPage::initGUI() | |||
230 | #else //KAB_EMBEDDED | 230 | #else //KAB_EMBEDDED |
231 | mCategoryCombo = new QComboBox( false, this ); | 231 | mCategoryCombo = new QComboBox( false, this ); |
232 | #endif //KAB_EMBEDDED | 232 | #endif //KAB_EMBEDDED |
233 | 233 | if ( QApplication::desktop()->width() < 320 ) | |
234 | mCategoryCombo->setMaximumWidth( 70 ); | ||
234 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::All ) ); | 235 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::All ) ); |
235 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Frequent ) ); | 236 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Frequent ) ); |
236 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Address ) ); | 237 | mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Address ) ); |
@@ -241,7 +242,7 @@ void ViewConfigureFieldsPage::initGUI() | |||
241 | connect( mCategoryCombo, SIGNAL( activated(int) ), SLOT( slotShowFields(int) ) ); | 242 | connect( mCategoryCombo, SIGNAL( activated(int) ), SLOT( slotShowFields(int) ) ); |
242 | gl->addWidget( mCategoryCombo, 0, 0 ); | 243 | gl->addWidget( mCategoryCombo, 0, 0 ); |
243 | 244 | ||
244 | QLabel *label = new QLabel( i18n( "&Selected fields:" ), this ); | 245 | QLabel *label = new QLabel( i18n( "&Selected\nfields:" ), this ); |
245 | if (orientation == 0) | 246 | if (orientation == 0) |
246 | gl->addWidget( label, 0, 2 ); | 247 | gl->addWidget( label, 0, 2 ); |
247 | else | 248 | else |
@@ -250,14 +251,19 @@ void ViewConfigureFieldsPage::initGUI() | |||
250 | 251 | ||
251 | mUnSelectedBox = new QListBox( this ); | 252 | mUnSelectedBox = new QListBox( this ); |
252 | mUnSelectedBox->setSelectionMode( QListBox::Extended ); | 253 | mUnSelectedBox->setSelectionMode( QListBox::Extended ); |
253 | mUnSelectedBox->setMinimumHeight( 100 ); | 254 | mUnSelectedBox->setMinimumHeight( 80 ); |
254 | if (orientation == 0) | 255 | if (orientation == 0) |
255 | gl->addWidget( mUnSelectedBox, 1, 0 ); | 256 | gl->addWidget( mUnSelectedBox, 1, 0 ); |
256 | else | 257 | else |
257 | gl->addWidget( mUnSelectedBox, 0, 1 ); | 258 | gl->addWidget( mUnSelectedBox, 0, 1 ); |
258 | 259 | ||
259 | mSelectedBox = new QListBox( this ); | 260 | mSelectedBox = new QListBox( this ); |
261 | //if ( QApplication::desktop()->width() < 320 ) { | ||
262 | // mUnSelectedBox->setMaximumWidth( 134 ); | ||
263 | // mSelectedBox->setMaximumWidth( 134 ); | ||
264 | //} | ||
260 | mSelectedBox->setSelectionMode( QListBox::Extended ); | 265 | mSelectedBox->setSelectionMode( QListBox::Extended ); |
266 | mSelectedBox->setMinimumHeight( 80 ); | ||
261 | label->setBuddy( mSelectedBox ); | 267 | label->setBuddy( mSelectedBox ); |
262 | if (orientation == 0) | 268 | if (orientation == 0) |
263 | gl->addWidget( mSelectedBox, 1, 2 ); | 269 | gl->addWidget( mSelectedBox, 1, 2 ); |
@@ -325,10 +331,10 @@ void ViewConfigureFieldsPage::initGUI() | |||
325 | // get the maxItemWidth we need to not truncate the view | 331 | // get the maxItemWidth we need to not truncate the view |
326 | slotShowFields( 0 ); | 332 | slotShowFields( 0 ); |
327 | 333 | ||
328 | sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); | 334 | //sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() ); |
329 | sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); | 335 | //sizeHint.setWidth( mUnSelectedBox->maxItemWidth() ); |
330 | mUnSelectedBox->setMinimumSize( sizeHint ); | 336 | // mUnSelectedBox->setMinimumSize( sizeHint ); |
331 | mSelectedBox->setMinimumSize( sizeHint ); | 337 | //mSelectedBox->setMinimumSize( sizeHint ); |
332 | 338 | ||
333 | gl->activate(); | 339 | gl->activate(); |
334 | 340 | ||