fixed some whantsnext view kayout

4 files changed, 27 insertions, 10 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 3aae076..749204b 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -374,8 +374,14 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
 
     mExpandButton = new QPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
-                                               QSizePolicy::Fixed ) );
+    int widebut = mExpandButton->sizeHint().width();
+    if (   QApplication::desktop()->width() < 480  )
+        widebut = widebut*2;
+    else
+        widebut = (widebut*3) / 2;
+    //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
+    //                                         QSizePolicy::Fixed ) );
+    mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
     mExpandButton->setFocusPolicy(NoFocus);
     mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 0fea9be..59b864c 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -39,7 +39,7 @@
 #include "koglobals.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
-
+#include <qstylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
 
@@ -68,7 +68,17 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
     setFont( KOPrefs::instance()->mWhatsNextFont );
     mView = new WhatsNextTextBrowser(this);
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
+    QStyleSheet* stsh = mView->styleSheet();
+    QStyleSheetItem * style ;
  
+    style   = stsh->item ("h2" );
+    if ( style ) {
+        style->setMargin(QStyleSheetItem::MarginAll,0);  
+    }
+    style   = stsh->item ("table" );
+    if ( style ) {
+        style->setMargin(QStyleSheetItem::MarginAll,0);  
+    }
     mEventViewer = 0;
 
     QBoxLayout *topLayout = new QVBoxLayout(this);
@@ -144,7 +154,7 @@ void KOWhatsNextView::updateView()
     QString ipath;// = new QString();
     //  kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath);
     //<big><big><strong>" + date + "</strong></big></big>\n";
-    mText = "<table width=\"100%\">\n";
+    mText = "<qt><table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>";
@@ -326,7 +336,7 @@ void KOWhatsNextView::updateView()
     if (replys > 0 ) mText += "</table>\n";
 
 
-    mText += "</td></tr>\n</table>\n";
+    mText += "</td></tr>\n</table></qt>\n";
 
     mView->setText(mText);
     mView->setFocus();
@@ -340,6 +350,7 @@ void KOWhatsNextView::updateView()
     //  test->show();
     //   mView->setBackgroundMode(FixedPixmap  );
     //   mView->setBackgroundPixmap ( bPix );
+    qDebug("%s ",mText.latin1());
 }
 
 void  KOWhatsNextView::appendDay( int i, QDate eventDate )
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index f719c31..a19900f 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -58,6 +58,8 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
   mButtonAdd->setEnabled(!mEdit->text().isEmpty());
   if ( QApplication::desktop()->width() > 460 )
       resize( 300, 360 );
+  else
+      showMaximized();
 }
 
 /*
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 40b46cf..7df9154 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -46,12 +46,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
   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()
 {