1 files changed, 7 insertions, 1 deletions

diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index ab95d5f..6282453 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -1,85 +1,86 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Anders Lund <anders.lund@lund.tdcadsl.dk>
                        Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $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>
 #include <qstringlist.h>
 #include <qwhatsthis.h>
 
 #include "kabcore.h"
 #include "kabprefs.h"
 
 #include "xxportselectdialog.h"
 
 XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
                                         QWidget* parent, const char* name )
     : KDialogBase( Plain, i18n( "Choose which contacts to select" ), Help | Ok | Cancel,
                    Ok, parent, name, true, true ), mCore( core ),
       mUseSorting( sort )
 {
   initGUI();
 
   connect( mFiltersCombo, SIGNAL( activated( int ) ),
            SLOT( filterChanged( int ) ) );
   connect( mCategoriesView, SIGNAL( clicked( QListViewItem* ) ),
            SLOT( categoryClicked( QListViewItem* ) ) );
 
   // setup filters
 #ifndef KAB_EMBEDDED
   mFilters = Filter::restore( kapp->config(), "Filter" );
   Filter::List::iterator filterIt;
 #else //KAB_EMBEDDED
   mFilters = Filter::restore( KGlobal::config(), "Filter" );
   Filter::List::Iterator filterIt;
 #endif //KAB_EMBEDDED
   QStringList filters;
   for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt )
     filters.append( (*filterIt).name() );
 
   mFiltersCombo->insertStringList( filters );
   mUseFilters->setEnabled( filters.count() > 0 );
 
   // setup categories
   QStringList categories =  KABPrefs::instance()->mCustomCategories;
   QStringList::Iterator it;
   for ( it = categories.begin(); it != categories.end(); ++it )
@@ -200,89 +201,94 @@ void XXPortSelectDialog::slotHelp()
 void XXPortSelectDialog::initGUI()
 {
   QFrame *page = plainPage();
 
   QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
   topLayout->addWidget( label );
 
   mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
   mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->layout()->setMargin( KDialog::marginHint() );
 
   QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() );
   groupLayout->setAlignment( Qt::AlignTop );
 
   mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
   QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
   groupLayout->addWidget( mUseWholeBook, 0, 0 );
 
   mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup );
   QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
                                         "This option is disabled if no contacts are selected." ) );
   groupLayout->addWidget( mUseSelection, 1, 0 );
 
   mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup );
   QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
                                      "This option is disabled if you haven't defined any filters" ) );
   groupLayout->addWidget( mUseFilters, 2, 0 );
 
   mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup );
   QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
                                        "This option is disabled if you have no categories." ) );
   groupLayout->addWidget( mUseCategories, 3, 0 );
 
   mFiltersCombo = new QComboBox( false, mButtonGroup );
   QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
   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 );
 
   label = new QLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
 
 #ifndef KAB_EMBEDDED
   mFieldCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
   //US Combobox is not editable anyway
   mFieldCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
   sortLayout->addWidget( mFieldCombo, 0, 1 );
 
   label = new QLabel( i18n( "Order:" ), sortingGroup );
   sortLayout->addWidget( label, 1, 0 );
 
 #ifndef KAB_EMBEDDED
   mSortTypeCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
   //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