fixed some whantsnext view kayout

2 files changed, 5 insertions, 5 deletions

diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index f719c31..a19900f 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -1,135 +1,137 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@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.
 */
 
 #include <qstringlist.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include "kpimprefs.h"
 
 #include "categoryeditdialog.h"
 
 using namespace KPIM;
 
 CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
                                         const char* name, bool modal,
                                         WFlags fl )
   : CategoryEditDialog_base( parent, name, modal, fl ),
     mPrefs( prefs )  
 {
   mCategories->header()->hide();
 
   QStringList::Iterator it;
   bool categoriesExist=false;
   for (it = mPrefs->mCustomCategories.begin();
        it != mPrefs->mCustomCategories.end(); ++it ) {
     new QListViewItem(mCategories,*it);
     categoriesExist=true;
   }
 
   connect(mCategories,SIGNAL(selectionChanged(QListViewItem *)),
           SLOT(editItem(QListViewItem *)));
   connect(mEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString &)));
   mButtonRemove->setEnabled(categoriesExist);
   mButtonModify->setEnabled(categoriesExist);
   mButtonAdd->setEnabled(!mEdit->text().isEmpty());
   if ( QApplication::desktop()->width() > 460 )
       resize( 300, 360 );
+  else
+      showMaximized();
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 CategoryEditDialog::~CategoryEditDialog()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void CategoryEditDialog::slotTextChanged(const QString &text)
 {
     mButtonAdd->setEnabled(!text.isEmpty());
 }
 
 void CategoryEditDialog::add()
 {
   if (!mEdit->text().isEmpty()) {
     new QListViewItem(mCategories,mEdit->text());
     mEdit->setText("");
     mButtonRemove->setEnabled(mCategories->childCount()>0);
     mButtonModify->setEnabled(mCategories->childCount()>0);
   }
 }
 
 void CategoryEditDialog::remove()
 {
   if (mCategories->currentItem()) {
     delete mCategories->currentItem();
     mButtonRemove->setEnabled(mCategories->childCount()>0);
     mButtonModify->setEnabled(mCategories->childCount()>0);
   }
 }
 
 void CategoryEditDialog::modify()
 {
   if (!mEdit->text().isEmpty()) {
     if (mCategories->currentItem()) {
       mCategories->currentItem()->setText(0,mEdit->text());
     }
   }
 }
 void CategoryEditDialog::accept()
 {
     slotOk();
 }
 
 void CategoryEditDialog::slotOk()
 {
   slotApply();
   QDialog::accept();
 }
 
 void CategoryEditDialog::slotApply()
 {
   mPrefs->mCustomCategories.clear();
 
   QListViewItem *item = mCategories->firstChild();
   while(item) {
     mPrefs->mCustomCategories.append(item->text(0));
     item = item->nextSibling();
   }
   mPrefs->writeConfig();
 
   emit categoryConfigChanged();
 }
 
 void CategoryEditDialog::editItem(QListViewItem *item)
 {
   mEdit->setText(item->text(0));
   mButtonRemove->setEnabled(true);
   mButtonModify->setEnabled(true);
 }
 
 //US #include "categoryeditdialog.moc"
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 40b46cf..7df9154 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -1,150 +1,148 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@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.
 */
 
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qheader.h>
 #include <qapp.h>
 #include <qmessagebox.h>
 
 
 #include "categoryeditdialog.h"
 #include "categoryselectdialog.h"
 
 #include "kpimprefs.h"
 
 using namespace KPIM;
 
 CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
                                             const char* name, 
                                             bool modal, WFlags fl )
   : CategorySelectDialog_base( parent, name, true, fl ),
     mPrefs( prefs )
 {
   mCategories->header()->hide();
 
   setCategories();
  
   connect(mButtonEdit,SIGNAL(clicked()),this, SLOT(editCategoriesDialog()));
-  if ( qApp->desktop()->height() < 321 )
-      setMaximumHeight( QApplication::desktop()->height() - 50 );
-  else
-      setMaximumHeight( QApplication::desktop()->height() - 80 );
   if ( QApplication::desktop()->width() > 460 )
-      resize( 260, 360 );
+      resize( 300, 360 );
+  else
+      showMaximized();
 }
 void CategorySelectDialog::editCategoriesDialog()
 {
     KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this );
     
     ced->exec();
     delete ced;
     setCategories();
 }
 void CategorySelectDialog::setCategories()
 {
   mCategories->clear();
   mCategoryList.clear();
 
   QStringList::Iterator it;
 
   for (it = mPrefs->mCustomCategories.begin();
        it != mPrefs->mCustomCategories.end(); ++it ) {
     new QCheckListItem(mCategories,*it,QCheckListItem::CheckBox);
   }
 }
 
 CategorySelectDialog::~CategorySelectDialog()
 {
 }
 
 void CategorySelectDialog::setSelected(const QStringList &selList)
 {
   clear();
 
   QStringList::ConstIterator it;
   QStringList notFound;
   bool found = false;
   for (it=selList.begin();it!=selList.end();++it) {
       //qDebug(" CategorySelectDialog::setSelected(");
     QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
     while (item) {
       if (item->text() == *it) {
         item->setOn(true);
         found = true;
         break;
       }
       item = (QCheckListItem *)item->nextSibling();
     }
 //   if ( ! found ) {
 
 //emit updateCategoriesGlobal();
 //   QMessageBox::information( this, "KO/E: Information!",
 //                                   "Categories found, which were not\n"
 //                                   "in list of categories!\n"
 //                                   "message",
 //                                           "OK", "", 0,
 //                                           0, 1 );
 //         setSelected(selList);
 //         return;
 //    }
   }
 }
 
 QStringList CategorySelectDialog::selectedCategories() const
 {
   return mCategoryList;
 }
 
 void CategorySelectDialog::slotApply()
 {
   QStringList categories;
   QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
   while (item) {
     if (item->isOn()) {
       categories.append(item->text());
     }
     item = (QCheckListItem *)item->nextSibling();
   }
   
   QString categoriesStr = categories.join(",");
 
   mCategoryList = categories;
 
   emit categoriesSelected(categories);
   emit categoriesSelected(categoriesStr);
 }
 void CategorySelectDialog::accept()
 {
     slotOk();
 }
 
 void CategorySelectDialog::slotOk()
 {
   slotApply();
   QDialog::accept();
 }
 
 void CategorySelectDialog::clear()
 {
   QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();